Add extra check incase plugin not implemented

johnramsden · Oct 9, 2018 · 8af5752 · 8af5752
1 parent 9fff478
commit 8af5752
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/zedenv/cli/activate.py b/zedenv/cli/activate.py
@@ -231,15 +231,20 @@ def zedenv_activate(boot_environment: str,
         except RuntimeWarning as err:
             ZELogger.verbose_log({
                 "level": "WARNING",
-                "message": f"During {plugin.bootloader} mid activate the following occurred:\n"
+                "message": f"During {plugin.bootloader} pre activate the following occurred:\n"
                            f"\n{err}\nContinuing activation.\n"
             }, verbose)
         except RuntimeError as err:
             ZELogger.log({
                 "level": "EXCEPTION",
-                "message": f"During {plugin.bootloader} mid activate the following occurred:\n"
+                "message": f"During {plugin.bootloader} pre activate the following occurred:\n"
                            f"\n{err}\nStopping activation.\n"
             }, exit_on_error=True)
+        except AttributeError:
+            ZELogger.verbose_log({
+                "level": "INFO",
+                "message": f"Tried to run {plugin.bootloader} 'pre activate', not implemented.\n"
+            }, verbose)
 
     if not pyzfscmds.utility.dataset_exists(be_requested):
         ds_is_clone = None
@@ -300,15 +305,20 @@ def zedenv_activate(boot_environment: str,
         except RuntimeWarning as err:
             ZELogger.verbose_log({
                 "level": "WARNING",
-                "message": f"During {plugin.bootloader} mid activate the following occurred:\n"
+                "message": f"During {plugin.bootloader} post activate the following occurred:\n"
                            f"\n{err}\nContinuing activation.\n"
             }, verbose)
         except RuntimeError as err:
             ZELogger.log({
                 "level": "EXCEPTION",
-                "message": f"During {plugin.bootloader} mid activate the following occurred:\n"
+                "message": f"During {plugin.bootloader} post activate the following occurred:\n"
                            f"\n{err}\nStopping activation.\n"
             }, exit_on_error=True)
+        except AttributeError:
+            ZELogger.verbose_log({
+                "level": "INFO",
+                "message": f"Tried to run {plugin.bootloader} 'post activate', not implemented.\n"
+            }, verbose)
 
 
 @click.command(name="activate",

diff --git a/zedenv/cli/destroy.py b/zedenv/cli/destroy.py
@@ -316,7 +316,13 @@ def zedenv_destroy(target: str,
             destroy_origin_snapshots(destroy_dataset, be_pool, origin_snaps, noop, verbose)
 
     if bootloader:
-        bootloader_plugin.post_destroy(target)
+        try:
+            bootloader_plugin.post_destroy(target)
+        except AttributeError:
+            ZELogger.verbose_log({
+                "level": "INFO",
+                "message": f"Tried to run plugin's 'post destroy', not implemented.\n"
+            }, verbose)
 
     ZELogger.verbose_log({
         "level": "INFO",

diff --git a/zedenv/plugins/configuration.py b/zedenv/plugins/configuration.py
@@ -232,3 +232,6 @@ def pre_activate(self):
 
     def mid_activate(self, be_mountpoint: str):
         pass
+
+    def post_destroy(self, target):
+        pass