Merge pull request #548 from netscaler/NSHELP-40733_sslcertfile

NSHELP-40733 sslcertfile module – Importing a new SSL certificate fai…

Author: shivashankar-vaddepally

plugins/module_utils/constants.py

@@ -135,3 +135,19 @@
     'cacheglobal_cachepolicy_binding',
     'botglobal_botpolicy_binding',
 ]
+
+GETALL_ONLY_RESOURCES = [
+    'appfwlearningdata',
+    'application',
+    'bridgetable',
+    'gslbldnsentry',
+    'locationfile',
+    'locationfile6',
+    'routerdynamicrouting',
+    'sslcertbundle',
+    'sslcertfile',
+    'sslcrlfile',
+    'ssldhfile',
+    'sslkeyfile',
+    'systementitydata'
+]

plugins/module_utils/module_executor.py

@@ -38,6 +38,7 @@
     HTTP_RESOURCE_ALREADY_EXISTS,
     NETSCALER_COMMON_ARGUMENTS,
     NITRO_ATTRIBUTES_ALIASES,
+    GETALL_ONLY_RESOURCES,
 )
 from .decorators import trace
 from .logger import log, loglines
@@ -321,17 +322,31 @@ def get_existing_resource(self):
         if is_exist is False:
             return {}
         if len(existing_resource) > 1:
-            msg = (
-                "ERROR: For resource `%s` Found more than one resource with the same primary key `%s` and resource_module_params %s"
-                % (
-                    self.resource_name,
-                    self.resource_id,
-                    self.resource_module_params,
+            if self.resource_name in GETALL_ONLY_RESOURCES:
+                for resources in existing_resource:
+                    # Check if all module params match this resource
+                    match_found = True
+                    for key, value in self.resource_module_params.items():
+                        if key in resources and resources[key] != value:
+                            match_found = False
+                            break
+
+                    # If all parameters match, use this resource
+                    if match_found:
+                        self.existing_resource = resources
+                        break
+            else:
+                msg = (
+                    "ERROR: For resource `%s` Found more than one resource with the same primary key `%s` and resource_module_params %s"
+                    % (
+                        self.resource_name,
+                        self.resource_id,
+                        self.resource_module_params,
+                    )
                 )
-            )
-            self.return_failure(msg)
-
-        self.existing_resource = existing_resource[0]
+                self.return_failure(msg)
+        else:
+            self.existing_resource = existing_resource[0]
 
         if self.resource_name in NITRO_ATTRIBUTES_ALIASES:
             self.existing_resource = self._add_nitro_attributes_aliases(

tools/migrationtool/convert_yaml.py

@@ -86,7 +86,7 @@ def get_task_level_keys(task_data, verbose):
 def get_cred_attributes(plugindata, verbose):
     logincreds = {}
     if verbose:
-        print(f"getting nitro credentials")
+        print("getting nitro credentials")
     try:
         for key in netscaler_login_specifics:
             if key in plugindata:
@@ -227,7 +227,7 @@ def convert_yaml_file(input_file, output_file, template_file, verbose):
         print(f"Error occurred during conversion: {e}")
         return
     print(f"Output written to: {output_file}")
-    print(f"YAML conversion completed")
+    print("YAML conversion completed")
 
 
 def main():