More changes to previous commit

Author: sivakasi-cisco

plugins/action/dtc/fabrics_config_save.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from .rest_module_utils import get_rest_module

plugins/action/dtc/fabrics_deploy.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from .rest_module_utils import get_rest_module

plugins/action/dtc/get_poap_data.py

@@ -25,6 +25,7 @@
 __metaclass__ = type
 
 from ansible.plugins.action import ActionBase
+from .rest_module_utils import get_rest_module
 import json
 import re
 import inspect
@@ -139,11 +140,11 @@ def _get_discovered(self, ip, role, hostname):
 
         return discovered
 
-
     def refresh(self) -> None:
         """
         ### Summary
         Refresh POAP data from NDFC
+
         """
         self.refresh_succeeded = False
         self.refresh_message = None

plugins/action/dtc/manage_child_fabric_networks.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from ansible.template import Templar

plugins/action/dtc/manage_child_fabric_vrfs.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from ansible.template import Templar
@@ -55,6 +54,14 @@ def run(self, tmp=None, task_vars=None):
 
         child_fabrics = msite_data['child_fabrics_data']
 
+
+        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
+
         for vrf in vrfs:
             vrf_attach_group_switches = [
                 vrf_attach_group_dict['switches']
@@ -132,7 +139,7 @@ def run(self, tmp=None, task_vars=None):
                         #         return results
 
                         ndfc_vrf = self._execute_module(
-                            module_name=task_vars['ansible_network_os_rest'],
+                            module_name=rest_module,
                             module_args={
                                 "method": "GET",
                                 "path": f"/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/top-down/fabrics/{child_fabric}/vrfs/{vrf['name']}"
@@ -197,7 +204,7 @@ def run(self, tmp=None, task_vars=None):
                             rendered_to_nice_json = templar.environment.filters['to_nice_json'](rendered_content)
 
                             ndfc_vrf_update = self._execute_module(
-                                module_name=task_vars['ansible_network_os_rest'],
+                                module_name=rest_module,
                                 module_args={
                                     "method": "PUT",
                                     "path": f"/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/top-down/fabrics/{child_fabric}/vrfs/{vrf['name']}",

plugins/action/dtc/manage_child_fabrics.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from .rest_module_utils import get_rest_module
@@ -44,11 +43,18 @@ def run(self, tmp=None, task_vars=None):
         child_fabrics = self._task.args['child_fabrics']
         state = self._task.args['state']
 
+        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
+
         if state == 'present':
             for fabric in child_fabrics:
                 json_data = '{"destFabric":"%s","sourceFabric":"%s"}' % (parent_fabric, fabric)
                 add_fabric_result = self._execute_module(
-                    module_name=task_vars['ansible_network_os_rest'],
+                    module_name=rest_module,
                     module_args={
                         "method": "POST",
                         "path": "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/msdAdd",
@@ -77,7 +83,7 @@ def run(self, tmp=None, task_vars=None):
             for fabric in child_fabrics:
                 json_data = '{"destFabric":"%s","sourceFabric":"%s"}' % (parent_fabric, fabric)
                 remove_fabric_result = self._execute_module(
-                    module_name=task_vars['ansible_network_os_rest'],
+                    module_name=rest_module,
                     module_args={
                         "method": "POST",
                         "path": "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/msdExit",

plugins/action/dtc/prepare_msite_child_fabrics_data.py

@@ -24,7 +24,6 @@
 
 __metaclass__ = type
 
-
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from .rest_module_utils import get_rest_module
@@ -44,10 +43,17 @@ def run(self, tmp=None, task_vars=None):
         parent_fabric = self._task.args["parent_fabric"]
         child_fabrics = self._task.args["child_fabrics"]
 
+        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
 
 display = Display()
 
@@ -38,18 +38,6 @@ class ActionModule(ActionBase):
     Action plugin to dynamically select between cisco.nd.nd_rest and cisco.dcnm.dcnm_rest
     based on the ansible_network_os variable.
     """
-    REST_MODULES = {
-        'cisco.nd.nd': 'cisco.nd.nd_rest',
-        'cisco.dcnm.dcnm': 'cisco.dcnm.dcnm_rest'
-    }
-
-    def get_rest_module(self, network_os):
-        if not network_os:
-            results['failed'] = True
-            results['msg'] = "ansible_network_os is not defined in task_vars"
-        else:
-            results = self.REST_MODULES.get(network_os)
-        return results
 
     def run(self, tmp=None, task_vars=None):
         """
@@ -75,14 +63,10 @@ def run(self, tmp=None, task_vars=None):
         display.vvvv(f"Using OS module: {network_os}")
 
         # Determine which module to use based on network_os
-        if network_os in self.REST_MODULES:
-            rest_module = self.get_rest_module(network_os)
-        else:
+        rest_module = get_rest_module(network_os)
+        if not rest_module:
             results['failed'] = True
-            results['msg'] = (
-                f"Unsupported network_os: {network_os}. "
-                "Must be 'cisco.nd.nd' or 'cisco.dcnm.dcnm'"
-            )
+            results['msg'] = f"Unsupported network_os: {network_os}"
             return results
 
         display.vvvv(f"Using ----------REST------------- module: {rest_module}")

plugins/plugin_utils/helper_functions.py

@@ -25,6 +25,7 @@
 # For example in prepare_serice_model.py we can do the following:
 #  from ..helper_functions import do_something
 
+from .rest_module_utils import get_rest_module
 
 def data_model_key_check(tested_object, keys):
     """
@@ -96,8 +97,15 @@ def ndfc_get_switch_policy(self, task_vars, tmp, switch_serial_number):
     :Raises:
         N/A
     """
+    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
+
     policy_data = self._execute_module(
-        module_name=task_vars['ansible_network_os_rest'],
+        module_name=rest_module,
         module_args={
             "method": "GET",
             "path": f"/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/policies/switches/{switch_serial_number}/SWITCH/SWITCH"
@@ -182,8 +190,15 @@ def ndfc_get_fabric_attributes(self, task_vars, tmp, fabric):
     :Raises:
         N/A
     """
+    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
+
     fabric_response = self._execute_module(
-        module_name=task_vars['ansible_network_os_rest'],
+        module_name=rest_module,
         module_args={
             "method": "GET",
             "path": f"/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{fabric}",

roles/dtc/create/tasks/external/fabric.yml

@@ -28,14 +28,14 @@
       - "+     Manage Fabric External {{ MD_Extended.vxlan.fabric.name }}"
       - "----------------------------------------------------------------"
 
-- name: Check if fabric External {{ MD_Extended.vxlan.fabric.name }} exists
+- name: Check if fabric External {{ MD_Extended.vxlan.fabric.name }} exists in NDFC
   cisco.nac_dc_vxlan.dtc.rest:
     method: GET
     path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ MD_Extended.vxlan.fabric.name }}"
   register: get_result
   failed_when: false
 
-- name: Manage fabric External {{ MD_Extended.vxlan.fabric.name }} (PUT)
+- name: Manage fabric External {{ MD_Extended.vxlan.fabric.name }} in NDFC (PUT)
   cisco.nac_dc_vxlan.dtc.rest:
     method: PUT
     path: '/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ MD_Extended.vxlan.fabric.name }}/External_Fabric'
@@ -45,7 +45,7 @@
     - get_result.response.DATA
   register: put_result
 
-- name: Manage fabric External {{ MD_Extended.vxlan.fabric.name }} (POST)
+- name: Manage fabric External {{ MD_Extended.vxlan.fabric.name }} in NDFC (POST)
   cisco.nac_dc_vxlan.dtc.rest:
     method: POST
     path: '/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ MD_Extended.vxlan.fabric.name }}/External_Fabric'