From 3dce56901256c259de23e76e02a78cf8d6b1d07e Mon Sep 17 00:00:00 2001
From: santaspeen <santaspeen@yandex.ru>
Date: Wed, 24 Jul 2024 11:16:02 +0300
Subject: [PATCH] [+] after-reboot [!] fix enum

---
 src/main.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main.py b/src/main.py
index 8def5c0..a86d0d8 100644
--- a/src/main.py
+++ b/src/main.py
@@ -315,23 +315,32 @@ class VMKer:
                 logger.exception(e)
 
     def _execute_yml(self, name, ssh, _pre=True):
-        for p, f in self.cmds.items():
+        for f, y in self.cmds.items():
             try:
                 if _pre:
-                    y = f.get('before-reboot')
+                    y = y.get('before-reboot')
                     logger.info(f"[{name}] [YML] Executing {f.name}..")
                     if not y:
                         return logger.debug(f"[{name}] [YML] Block 'before-reboot' not found. Skipping..")
                     for n, c in y.items():
                         logger.info(f"[{name}] [YML] {n}. Steps: {len(c)}.")
-                        for cmd, i in enumerate(c, 1):
+                        for i, cmd in enumerate(c, 1):
                             logger.debug(f"executing: {cmd}")
                             logger.debug(ssh.send_command(cmd))
                             logger.info(f"[{name}] [YML] {n}: {i}/{len(c)}")
                 else:
-                    y = f.get('after-reboot')
+                    y = y.get('after-reboot')
                     if not y:
                         return logger.debug(f"[{name}] [YML] Block 'after-reboot' not found. Skipping..")
+                    for n, c in y.items():
+                        logger.info(f"[{name}] [YML] {n}. Steps: {len(c)}.")
+                        for i, cmd in enumerate(c, 1):
+                            logger.debug(f"executing: {cmd}")
+                            logger.info(f"[{name}] < {cmd}")
+                            _ssh_output = ssh.send_command(cmd)
+                            logger.debug(_ssh_output)
+                            logger.info(f"[{name}] > {_ssh_output}")
+                            # logger.info(f"[{name}] [YML] {n}: {i}/{len(c)}")
             except Exception as e:
                 logger.exception(e)
 
@@ -383,7 +392,7 @@ class VMKer:
             logger.info(f"[{_name}] Password for root: {_pwd}")
             ssh.send_command(f'echo {_name} > /etc/hostname')
 
-            logger.info(f"[{_name}] [YML] After-Reboot.")
+            logger.info(f"[{_name}] [YML] Before-Reboot.")
             self._execute_yml(_name, ssh)
 
             ssh.disconnect()
@@ -403,7 +412,7 @@ class VMKer:
 
             logger.success(f"[{_name}] [SSH] Connected to {ipv4[0]} as {user}")
             logger.debug(f'[{_name}] uname {ssh.send_command("uname -a")}')
-            logger.info(f"[{_name}] [YML] Before-Reboot.")
+            logger.info(f"[{_name}] [YML] After-Reboot.")
             self._execute_yml(_name, ssh, False)
 
         except NetmikoAuthenticationException as e: