cli-lib communication draft with generators

Author: gronke

libiocage/cli/start.py

@@ -49,8 +49,11 @@ def cli(ctx, rc, jails, log_level):
     for jail in ioc_jails.list(filters=jails):
         logger.log(f"Starting {jail.humanreadable_name}")
         try:
-            jail.start()
+            for i in jail.start(yields=True):
+                print(f"[+] {i.action} OK")
+
         except Exception:
+            raise
             exit(1)
 
         logger.log(f"{jail.humanreadable_name} running as JID {jail.jid}")

libiocage/lib/Jail.py

@@ -14,6 +14,7 @@
 import libiocage.lib.ZFSShareStorage
 import libiocage.lib.DevfsRules
 import libiocage.lib.errors
+import libiocage.lib.events
 import libiocage.lib.helpers
 
 
@@ -133,7 +134,7 @@ def rc_conf(self):
             )
         return self._rc_conf
 
-    def start(self):
+    def start(self, yields=False):
         """
         Start the jail.
         """
@@ -158,16 +159,33 @@ def start(self):
         self.config.fstab.save_with_basedirs()
         self._launch_jail()
 
+        if yields is True:
+            yield libiocage.lib.events.JailStarted(jail=self)
+
         if self.config["vnet"]:
             self._start_vimage_network()
             self._configure_routes()
+            if yields is True:
+                yield libiocage.lib.events.JailVnetConfigured(jail=self)
 
         self._configure_nameserver()
 
         if self.config["jail_zfs"] is True:
             libiocage.lib.ZFSShareStorage.ZFSShareStorage.mount_zfs_shares(
                 self.storage
             )
+            if yields is True:
+                yield libiocage.lib.events.JailZfsSharesMounted(jail=self)
+
+        if self.config["exec_start"] is not None:
+            self._start_services()
+            if yields is True:
+                yield libiocage.lib.events.JailServicesStarted(jail=self)
+
+    def _start_services(self):
+        command = self.config["exec_start"].strip().split()
+        self.logger.debug(f"Running exec_start on {self.humanreadable_name}")
+        self.exec(command)
 
     def stop(self, force=False):
         """
@@ -472,7 +490,7 @@ def _launch_jail(self):
             f"exec.prestart={self.config['exec_prestart']}",
             f"exec.poststart={self.config['exec_poststart']}",
             f"exec.prestop={self.config['exec_prestop']}",
-            f"exec.start={self.config['exec_start']}",
+            #f"exec.start={self.config['exec_start']}",
             f"exec.stop={self.config['exec_stop']}",
             f"exec.clean={self.config['exec_clean']}",
             f"exec.timeout={self.config['exec_timeout']}",
@@ -511,7 +529,7 @@ def _launch_jail(self):
 
     def _start_vimage_network(self):
 
-        self.logger.log("Starting VNET/VIMAGE", jail=self)
+        self.logger.debug("Starting VNET/VIMAGE", jail=self)
 
         nics = self.config["interfaces"]
         for nic in nics:

libiocage/lib/events.py

@@ -0,0 +1,48 @@
+EVENT_STATUS = (
+    "pending",
+    "done",
+    "failed"
+)
+
+
+class Iocage:
+    """
+    IocageEvent
+
+    Base class for all other iocage events
+    """
+
+    def __init__(self, action, *args, **kwargs):
+        self.action = action
+        #self.status = EVENT_STATUS.index(status)
+        #self.data = kwargs
+
+
+class Jail(Iocage):
+
+    def __init__(self, action, jail, *args, **kwargs):
+        super().__init__(action=action, jail=jail, *args, **kwargs)
+
+
+class JailStarted(Jail):
+
+    def __init__(self, jail, *args, **kwargs):
+        super().__init__("Started", jail, *args, **kwargs)
+
+
+class JailVnetConfigured(Jail):
+
+    def __init__(self, jail, *args, **kwargs):
+        super().__init__("Configuring VNET", jail, *args, **kwargs)
+
+
+class JailZfsShareMounted(Jail):
+
+    def __init__(self, jail, *args, **kwargs):
+        super().__init__("Mounting ZFS shares", jail, *args, **kwargs)
+
+
+class JailServicesStarted(Jail):
+
+    def __init__(self, jail, *args, **kwargs):
+        super().__init__("Starting services", jail, *args, **kwargs)