refactor subcommand parser

Author: jtdub

netnir/__init__.py

@@ -3,4 +3,4 @@
 netnir will create the default config and folders.
 """
 
-__version__ = "0.0.15"
+__version__ = "0.0.16"

netnir/cli.py

@@ -19,29 +19,15 @@ def __init__(self):
         A class object used to setup the netnir cli, consume the available commands from plugins,
         display the available commands, and execute the available commands based on user input.
         """
+        from netnir.helpers import plugins_import
+
         self.plugins = NETNIR_CONFIG["plugins"]
-        self.loaded_plugins = dict()
         self.parser = MyParser(prog="netnir")
         self.parser.add_argument(
             "--version", default=False, action="store_true", help="display version"
         )
-
         subparsers = self.parser.add_subparsers(title="netnir commands", dest="command")
-
-        for task_key, task in self.plugins.items():
-            plugin = task["class"].split(".")[:-1]
-            app = task["class"].split(".")[-1]
-            cmdparser = subparsers.add_parser(
-                task_key, help=task["description"], description=task["description"],
-            )
-
-            try:
-                plugin = getattr(__import__(".".join(plugin), fromlist=[app]), app)
-                self.loaded_plugins.update({task_key: plugin})
-            except ModuleNotFoundError:
-                raise
-
-            plugin.parser(cmdparser)
+        self.loaded_plugins = plugins_import(tasks=self.plugins, subparsers=subparsers)
 
         self.args = self.parser.parse_args()
 

netnir/core/tasks/fetch/__init__.py

@@ -1,4 +1,3 @@
-from netnir.core.tasks.fetch.config import FetchConfig
 from netnir.helpers.scaffold.subcommand import SubCommandParser
 
 
@@ -14,7 +13,7 @@ class Fetch(SubCommandParser):
     title = "fetch commands"
     tasks = {
         "config": {
-            "class": FetchConfig,
+            "class": "netnir.core.tasks.fetch.config.FetchConfig",
             "description": "fetch current config from a network device",
         },
     }

netnir/helpers/__init__.py

@@ -150,3 +150,19 @@ def netnir_config(config_file: str = "netnir.yaml"):
         logging.warning(message)
 
     return yaml.load(open(config_file), Loader=yaml.SafeLoader)
+
+
+def plugins_import(tasks: dict, subparsers: object):
+    loaded_plugins = dict()
+
+    for task_key, task in tasks.items():
+        plugin = task["class"].split(".")[:-1]
+        app = task["class"].split(".")[-1]
+        cmdparser = subparsers.add_parser(
+            task_key, help=task["description"], description=task["description"],
+        )
+        plugin = getattr(__import__(".".join(plugin), fromlist=[app]), app)
+        loaded_plugins.update({task_key: plugin})
+        plugin.parser(cmdparser)
+
+    return loaded_plugins

netnir/helpers/scaffold/subcommand.py

@@ -34,19 +34,19 @@ def parser(cls, parser):
         """
         sub command parser.
         """
-        subparsers = parser.add_subparsers(title=cls.title, dest="command")
+        from netnir.helpers import plugins_import
 
-        for task_key, task in cls.tasks.items():
-            cmdparser = subparsers.add_parser(
-                task_key, help=task["description"], description=task["description"],
-            )
-            task["class"].parser(cmdparser)
+        subparsers = parser.add_subparsers(title=cls.title, dest="command")
+        plugins_import(tasks=cls.tasks, subparsers=subparsers)
 
     def run(self):
         """
         execute the subcommand parser.
         """
         command = self.args.command
-        action_class = self.tasks[command]["class"]
+        action = self.tasks[command]["class"]
+        plugin = action.split(".")[:-1]
+        app = action.split(".")[-1]
+        action_class = getattr(__import__(".".join(plugin), fromlist=[app]), app)
         action = action_class(self.args)
         action.run()