Merge branch 'develop' of https://github.com/sivakasi-cisco/ansible-dc-vxlan into changes_for_nd_rest

Author: sivakasi-cisco

.github/workflows/main.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Check out code
       uses: actions/checkout@v4
-    
+
     - name: Set up Python 3.10.14
       uses: actions/setup-python@v5
       with:

plugins/action/common/nac_dc_validate.py

@@ -29,16 +29,22 @@
 from ansible.errors import AnsibleError
 
 try:
-    from iac_validate.yaml import load_yaml_files
-    import iac_validate.validator
-    from iac_validate.cli.options import DEFAULT_SCHEMA
-except ImportError as imp_exc:
-    IAC_VALIDATE_IMPORT_ERROR = imp_exc
+    from nac_yaml.yaml import load_yaml_files
+except ImportError as imp_yaml_exc:
+    NAC_YAML_IMPORT_ERROR = imp_yaml_exc
 else:
-    IAC_VALIDATE_IMPORT_ERROR = None
+    NAC_YAML_IMPORT_ERROR = None
+
+try:
+    import nac_validate.validator
+    from nac_validate.cli.defaults import DEFAULT_SCHEMA
+except ImportError as imp_val_exc:
+    NAC_VALIDATE_IMPORT_ERROR = imp_val_exc
+else:
+    NAC_VALIDATE_IMPORT_ERROR = None
 
 import os
-from ...plugin_utils.helper_functions import data_model_key_check
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import data_model_key_check
 
 display = Display()
 
@@ -50,8 +56,11 @@ def run(self, tmp=None, task_vars=None):
         results['failed'] = False
         results['msg'] = None
 
-        if IAC_VALIDATE_IMPORT_ERROR:
-            raise AnsibleError('iac-validate not found and must be installed. Please pip install iac-validate.') from IAC_VALIDATE_IMPORT_ERROR
+        if NAC_YAML_IMPORT_ERROR:
+            raise AnsibleError('nac-yaml not found and must be installed. Please pip install nac-yaml.') from NAC_YAML_IMPORT_ERROR
+
+        if NAC_VALIDATE_IMPORT_ERROR:
+            raise AnsibleError('nac-validate not found and must be installed. Please pip install nac-validate.') from NAC_VALIDATE_IMPORT_ERROR
 
         schema = self._task.args.get('schema')
         rules = self._task.args.get('rules')
@@ -134,7 +143,7 @@ def run(self, tmp=None, task_vars=None):
             rules_list.append(f'{rules}')
 
         for rules_item in rules_list:
-            validator = iac_validate.validator.Validator(schema, rules_item)
+            validator = nac_validate.validator.Validator(schema, rules_item)
             if schema:
                 validator.validate_syntax([mdata])
             if rules_item:

plugins/action/common/prepare_plugins/prep_001_fabric.py

@@ -20,7 +20,7 @@
 # SPDX-License-Identifier: MIT
 
 from ansible.utils.display import Display
-from ....plugin_utils.helper_functions import data_model_key_check
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import data_model_key_check
 
 display = Display()
 

plugins/action/common/prepare_plugins/prep_002_list_defaults.py

@@ -20,8 +20,8 @@
 # SPDX-License-Identifier: MIT
 
 from ansible.utils.display import Display
-from ....plugin_utils.helper_functions import data_model_key_check
-from ....plugin_utils.data_model_keys import model_keys
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import data_model_key_check
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.data_model_keys import model_keys
 from functools import reduce
 import operator
 

plugins/action/common/prepare_plugins/prep_103_topology_switches.py

@@ -19,7 +19,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-from ....plugin_utils.helper_functions import hostname_to_ip_mapping, data_model_key_check
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import hostname_to_ip_mapping, data_model_key_check
 
 
 class PreparePlugin:

plugins/action/common/prepare_plugins/prep_104_fabric_overlay.py

@@ -19,9 +19,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-# from ....plugin_utils.helper_functions import data_model_key_check
-
-
 class PreparePlugin:
     def __init__(self, **kwargs):
         self.kwargs = kwargs

plugins/action/common/prepare_plugins/prep_105_topology_interfaces.py

@@ -19,9 +19,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-
 # Count interfaces of different types and expose in extended service model for controls within playbooks
 #
+
 class PreparePlugin:
     def __init__(self, **kwargs):
         self.kwargs = kwargs

plugins/action/common/prepare_plugins/prep_107_vrf_lites.py

@@ -20,7 +20,7 @@
 # SPDX-License-Identifier: MIT
 
 from jinja2 import ChainableUndefined, Environment, FileSystemLoader
-from ....plugin_utils.helper_functions import hostname_to_ip_mapping
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import hostname_to_ip_mapping
 from ansible_collections.ansible.utils.plugins.filter import ipaddr
 
 

plugins/action/common/prepare_plugins/prep_108_route_control.py

@@ -22,7 +22,7 @@
 import re
 from jinja2 import ChainableUndefined, Environment, FileSystemLoader
 from ansible_collections.ansible.utils.plugins.filter import ipaddr, hwaddr
-from ....plugin_utils.helper_functions import hostname_to_ip_mapping, data_model_key_check
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import hostname_to_ip_mapping, data_model_key_check
 
 
 class PreparePlugin:

plugins/action/common/prepare_plugins/prep_118_topology_edge_connections.py

@@ -19,7 +19,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-
 class PreparePlugin:
     def __init__(self, **kwargs):
         self.kwargs = kwargs