moving get_rest_module to common helper function

Author: sivakasi-cisco

plugins/action/dtc/fabric_check_sync.py

@@ -26,7 +26,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 
 display = Display()

plugins/action/dtc/fabrics_config_save.py

@@ -26,7 +26,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 
 display = Display()

plugins/action/dtc/fabrics_deploy.py

@@ -26,7 +26,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 
 display = Display()
@@ -40,6 +40,7 @@ def run(self, tmp=None, task_vars=None):
         results['failed'] = False
 
         fabrics = self._task.args["fabrics"]
+
         for fabric in fabrics:
             display.display(f"Executing config-deploy on Fabric: {fabric}")
             network_os = task_vars['ansible_network_os']

plugins/action/dtc/get_poap_data.py

@@ -25,7 +25,7 @@
 __metaclass__ = type
 
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 import json
 import re
 import inspect

plugins/action/dtc/manage_child_fabric_networks.py

@@ -28,7 +28,7 @@
 from ansible.plugins.action import ActionBase
 from ansible.template import Templar
 from ansible.errors import AnsibleFileNotFound
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 
 import json

plugins/action/dtc/manage_child_fabric_vrfs.py

@@ -28,7 +28,7 @@
 from ansible.plugins.action import ActionBase
 from ansible.template import Templar
 from ansible.errors import AnsibleFileNotFound
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 
 import json

plugins/action/dtc/manage_child_fabrics.py

@@ -26,7 +26,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 display = Display()
 

plugins/action/dtc/prepare_msite_child_fabrics_data.py

@@ -26,7 +26,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 display = Display()
 

plugins/action/dtc/prepare_msite_data.py

@@ -26,9 +26,9 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
-from ...plugin_utils/helper_functions import ndfc_get_fabric_attributes
-from ...plugin_utils/helper_functions import ndfc_get_fabric_switches
+from ...plugin_utils.helper_functions import ndfc_get_fabric_attributes
+from ...plugin_utils.helper_functions import ndfc_get_fabric_switches
+from ...plugin_utils.helper_functions import get_rest_module
 import re
 
 display = Display()
@@ -45,10 +45,17 @@ def run(self, tmp=None, task_vars=None):
         model_data = self._task.args["model_data"]
         parent_fabric = self._task.args["parent_fabric"]
 
+        network_os = task_vars['ansible_network_os']
+        rest_module = get_rest_module(network_os)
+        if not rest_module:
+            results['failed'] = True
+            results['msg'] = f"Unsupported network_os: {network_os}"
+            return results
+
         # This is actaully not an accurrate API endpoint as it returns all fabrics in NDFC, not just the fabrics associated with MSD
         # Therefore, we need to get the fabric associations response and filter out the fabrics that are not associated with the parent fabric (MSD)
         msd_fabric_associations = self._execute_module(
-            module_name=task_vars['ansible_network_os_rest'],
+            module_name=rest_module,
             module_args={
                 "method": "GET",
                 "path": "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/msd/fabric-associations",

plugins/action/dtc/rest.py

@@ -28,7 +28,7 @@
 
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from .rest_module_utils import get_rest_module
+from ...plugin_utils.helper_functions import get_rest_module
 
 display = Display()