Initial changes to satisfy lint requirements

Author: sivakasi-cisco

plugins/action/tests/integration/ndfc_interface_validate.py

@@ -7,23 +7,17 @@
 import json
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
 from ..plugin_utils.tools import load_yaml_file, process_deepdiff
 from ..plugin_utils.pydantic_schemas.dcnm_interface.schemas import DcnmInterfaceQuerySchema
 
 try:
     from deepdiff import DeepDiff
-except ImportError as imp_exc:
-    DEEPDIFF_IMPORT_ERROR = imp_exc
-else:
+    HAS_DEEPDIFF = True
     DEEPDIFF_IMPORT_ERROR = None
-
-if DEEPDIFF_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('DeepDiff must be installed to use this plugin. Use pip or install test-requirements.'),
-        DEEPDIFF_IMPORT_ERROR)
+except ImportError as imp_exc:
+    HAS_DEEPDIFF = False
+    DEEPDIFF_IMPORT_ERROR = str(imp_exc)
 
 display = Display()
 
@@ -34,6 +28,12 @@ def run(self, tmp=None, task_vars=None):
         results = super(ActionModule, self).run(tmp, task_vars)
         results['failed'] = False
 
+        # Check if deepdiff is available at runtime
+        if not HAS_DEEPDIFF:
+            results['failed'] = True
+            results['msg'] = f"DeepDiff must be installed to use this plugin. Use pip or install test-requirements. Import error: {DEEPDIFF_IMPORT_ERROR}"
+            return results
+
         ndfc_data = self._task.args.get('ndfc_data', None)
         test_data = self._task.args.get('test_data', None)
         config_path = self._task.args.get('config_path', None)

plugins/action/tests/integration/ndfc_inventory_validate.py

@@ -2,9 +2,31 @@
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
 from typing import List, Dict, Optional, Union
-from pydantic import BaseModel, model_validator, validator, ValidationError
 import re
 import json
+
+try:
+    from pydantic import BaseModel, model_validator, validator, ValidationError
+    HAS_PYDANTIC = True
+except ImportError:
+    HAS_PYDANTIC = False
+    # Create dummy classes to allow import without pydantic
+    BaseModel = object
+
+    def model_validator(**kwargs):
+        """Dummy model_validator decorator that accepts any arguments"""
+        def decorator(func):
+            return func
+        return decorator
+
+    def validator(*args, **kwargs):
+        """Dummy validator decorator that accepts any arguments"""
+        def decorator(func):
+            return func
+        return decorator
+
+    ValidationError = Exception
+
 __metaclass__ = type
 
 display = Display()
@@ -128,7 +150,7 @@ def validate_lists_equality(cls, values):
                 if ((seed_ip_one is not None and ip_address_two is not None and ip_address_two == seed_ip_one) or (ignore_fields['seed_ip'])):
                     seed_ip_match = True
 
-                if ((role_one is not None and switch_role_two is not None and switch_role_two == role_one) or (ignore_fields['role'])) :
+                if ((role_one is not None and switch_role_two is not None and switch_role_two == role_one) or (ignore_fields['role'])):
                     role_match = True
 
                 if seed_ip_match and role_match:

plugins/action/tests/integration/ndfc_network_validate.py

@@ -7,23 +7,17 @@
 import json
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
 from ..plugin_utils.tools import load_yaml_file, process_deepdiff
 from ..plugin_utils.pydantic_schemas.dcnm_network.schemas import DcnmNetworkQuerySchema
 
 try:
     from deepdiff import DeepDiff
-except ImportError as imp_exc:
-    DEEPDIFF_IMPORT_ERROR = imp_exc
-else:
+    HAS_DEEPDIFF = True
     DEEPDIFF_IMPORT_ERROR = None
-
-if DEEPDIFF_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('DeepDiff must be installed to use this plugin. Use pip or install test-requirements.'),
-        DEEPDIFF_IMPORT_ERROR)
+except ImportError as imp_exc:
+    HAS_DEEPDIFF = False
+    DEEPDIFF_IMPORT_ERROR = str(imp_exc)
 
 display = Display()
 
@@ -81,6 +75,12 @@ def run(self, tmp=None, task_vars=None):
         results = super(ActionModule, self).run(tmp, task_vars)
         results['failed'] = False
 
+        # Check if deepdiff is available at runtime
+        if not HAS_DEEPDIFF:
+            results['failed'] = True
+            results['msg'] = f"DeepDiff must be installed to use this plugin. Use pip or install test-requirements. Import error: {DEEPDIFF_IMPORT_ERROR}"
+            return results
+
         ndfc_data = self._task.args.get('ndfc_data', None)
         test_data = self._task.args.get('test_data', None)
         config_path = self._task.args.get('config_path', None)

plugins/action/tests/integration/ndfc_vpc_pair_validate.py

@@ -7,23 +7,17 @@
 import json
 from ansible.utils.display import Display
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
 from ..plugin_utils.tools import load_yaml_file, process_deepdiff
 from ..plugin_utils.pydantic_schemas.dcnm_vpc_pair.schemas import DcnmVpcPairQuerySchema
 
 try:
     from deepdiff import DeepDiff
-except ImportError as imp_exc:
-    DEEPDIFF_IMPORT_ERROR = imp_exc
-else:
+    HAS_DEEPDIFF = True
     DEEPDIFF_IMPORT_ERROR = None
-
-if DEEPDIFF_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('DeepDiff must be installed to use this plugin. Use pip or install test-requirements.'),
-        DEEPDIFF_IMPORT_ERROR)
+except ImportError as imp_exc:
+    HAS_DEEPDIFF = False
+    DEEPDIFF_IMPORT_ERROR = str(imp_exc)
 
 display = Display()
 
@@ -202,6 +196,12 @@ def run(self, tmp=None, task_vars=None):
         results = super(ActionModule, self).run(tmp, task_vars)
         results['failed'] = False
 
+        # Check if deepdiff is available at runtime
+        if not HAS_DEEPDIFF:
+            results['failed'] = True
+            results['msg'] = f"DeepDiff must be installed to use this plugin. Use pip or install test-requirements. Import error: {DEEPDIFF_IMPORT_ERROR}"
+            return results
+
         ndfc_data = self._task.args.get('ndfc_data', None)
         test_data = self._task.args.get('test_data', None)
         config_path = self._task.args.get('config_path', None)

plugins/action/tests/plugin_utils/pydantic_schemas/dcnm_interface/schemas.py

@@ -1,20 +1,22 @@
 from __future__ import absolute_import, division, print_function
 from typing import List, Optional
 import re
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 
 try:
     from pydantic import BaseModel, field_validator
-except ImportError as imp_exc:
-    PYDANTIC_IMPORT_ERROR = imp_exc
-else:
-    PYDANTIC_IMPORT_ERROR = None
-
-if PYDANTIC_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('Pydantic must be installed to use this plugin. Use pip or install test-requirements.'),
-        PYDANTIC_IMPORT_ERROR)
+    HAS_PYDANTIC = True
+except ImportError:
+    HAS_PYDANTIC = False
+    # Create dummy classes to allow import without pydantic
+    BaseModel = object
+
+    def field_validator(*args, **kwargs):
+        """Dummy field_validator decorator that accepts any arguments"""
+        def decorator(func):
+            return func
+        return decorator
+
+# Note: If pydantic is not available, schemas will be imported but non-functional
 
 
 def expand_interface_name(name):

plugins/action/tests/plugin_utils/pydantic_schemas/dcnm_network/schemas.py

@@ -1,19 +1,25 @@
 from __future__ import absolute_import, division, print_function
 from typing import List, Optional, Annotated
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 
 try:
     from pydantic import BaseModel, model_validator, BeforeValidator
-except ImportError as imp_exc:
-    PYDANTIC_IMPORT_ERROR = imp_exc
-else:
-    PYDANTIC_IMPORT_ERROR = None
-
-if PYDANTIC_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('Pydantic must be installed to use this plugin. Use pip or install test-requirements.'),
-        PYDANTIC_IMPORT_ERROR)
+    HAS_PYDANTIC = True
+except ImportError:
+    HAS_PYDANTIC = False
+    # Create dummy classes to allow import without pydantic
+    BaseModel = object
+
+    def model_validator(*args, **kwargs):
+        """Dummy model_validator decorator that accepts any arguments"""
+        def decorator(func):
+            return func
+        return decorator
+
+    def BeforeValidator(func):
+        """Dummy BeforeValidator wrapper"""
+        return func
+
+# Note: If pydantic is not available, schemas will be imported but non-functional
 
 # Top level schema
 # Format: ModuleMethodSchema

plugins/action/tests/plugin_utils/pydantic_schemas/dcnm_vpc_pair/schemas.py

@@ -1,19 +1,25 @@
 from __future__ import absolute_import, division, print_function
 from typing import List, Optional, Annotated
-from ansible.module_utils.six import raise_from
-from ansible.errors import AnsibleError
 
 try:
     from pydantic import BaseModel, model_validator, BeforeValidator
-except ImportError as imp_exc:
-    PYDANTIC_IMPORT_ERROR = imp_exc
-else:
-    PYDANTIC_IMPORT_ERROR = None
-
-if PYDANTIC_IMPORT_ERROR:
-    raise_from(
-        AnsibleError('Pydantic must be installed to use this plugin. Use pip or install test-requirements.'),
-        PYDANTIC_IMPORT_ERROR)
+    HAS_PYDANTIC = True
+except ImportError:
+    HAS_PYDANTIC = False
+    # Create dummy classes to allow import without pydantic
+    BaseModel = object
+
+    def model_validator(*args, **kwargs):
+        """Dummy model_validator decorator that accepts any arguments"""
+        def decorator(func):
+            return func
+        return decorator
+
+    def BeforeValidator(func):
+        """Dummy BeforeValidator wrapper"""
+        return func
+
+# Note: If pydantic is not available, schemas will be imported but non-functional
 
 # Top level schema
 # Format: ModuleMethodSchema

plugins/module_utils/common/sender_requests.py

@@ -31,23 +31,17 @@
     HAS_REQUESTS = True
 except ImportError:
     HAS_REQUESTS = False
+    requests = None
 
 try:
     import urllib3
 
     HAS_URLLIB3 = True
 except ImportError:
     HAS_URLLIB3 = False
+    urllib3 = None
 
-if HAS_REQUESTS is False:
-    msg = "requests is not installed. "
-    msg += "install with e.g. pip install requests"
-    raise ImportError(msg)
-
-if HAS_URLLIB3 is False:
-    msg = "urllib3 is not installed. "
-    msg += "install with e.g. pip install urllib3"
-    raise ImportError(msg)
+# These will be checked at runtime rather than import time
 
 
 class Sender:
@@ -118,7 +112,8 @@ def __init__(self):
         self.class_name = self.__class__.__name__
         self._implements = "sender_v1"
 
-        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+        if HAS_URLLIB3:
+            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
         self.log = logging.getLogger(f"dcnm.{self.class_name}")
 
         self._domain = environ.get("ND_DOMAIN", "local")
@@ -183,6 +178,13 @@ def commit(self):
         method_name = inspect.stack()[0][3]
         caller = inspect.stack()[1][3]
         method_name = inspect.stack()[0][3]
+
+        # Check for required dependencies at runtime
+        if not HAS_REQUESTS:
+            msg = "requests is not installed. "
+            msg += "install with e.g. pip install requests"
+            raise ImportError(msg)
+
         msg = f"{self.class_name}.{method_name}: "
         msg += f"Caller: {caller}, ENTERED"
         self.log.debug(msg)

plugins/module_utils/network/dcnm/dcnm.py

@@ -613,14 +613,14 @@ def dcnm_get_url(module, fabric, path, items, module_name):
         elif iter != (send_count - 1):
             itemstr = ",".join(
                 itemlist[
-                    (iter * (len(itemlist) // send_count)) : (
+                    (iter * (len(itemlist) // send_count)): (
                         (iter + 1) * (len(itemlist) // send_count)
                     )
                 ]
             )
             url = path.format(fabric, itemstr)
         else:
-            itemstr = ",".join(itemlist[iter * (len(itemlist) // send_count) :])
+            itemstr = ",".join(itemlist[iter * (len(itemlist) // send_count):])
             url = path.format(fabric, itemstr)
 
         att_objects = dcnm_send(module, method, url)