Merge branch 'main' into rresources

Author: shivashankar-vaddepally

Makefile

@@ -1,38 +1,18 @@
 fmt:
 	autoflake plugins/modules/*.py
 	autoflake plugins/module_utils/*.py
-	autoflake tools/module_generator.py
 	autoflake --recursive tests/
 
 	black plugins/modules/*.py
 	black plugins/module_utils/*.py
-	black tools/module_generator.py
 	black tests/
 
 	isort plugins/modules/*.py
 	isort plugins/module_utils/*.py
-	isort tools/module_generator.py
 	isort tests/
 
 	yamlfmt .
 
-fmt_tools:
-	# ignore if file not found
-	-autoflake tools/generated_modules/*.py
-	-autoflake tools/module_generator.py
-	-autoflake tools/nitro_resource_map.py
-
-	-black tools/generated_modules/*.py
-	-black tools/module_generator.py
-	-black tools/nitro_resource_map.py
-
-	-isort tools/generated_modules/*.py
-	-isort tools/module_generator.py
-	-isort tools/nitro_resource_map.py
-
-generate_modules:
-	python3 tools/module_generator.py
-
 install:
 	ansible-galaxy collection install . --force
 

galaxy.yml

@@ -14,6 +14,7 @@ readme: README.md
 # @nicks:irc/im.site#channel'
 authors:
   - Sumanth Lingappa <sumanth.lingappa@cloud.com>
+  - Shiva Shankar Vaddepally <shivashankar.vaddepally@cloud.com>
 ### OPTIONAL but strongly recommended
 # A short summary description of the collection
 description: Ansible Collection Modules for NetScaler ADC

plugins/module_utils/common.py

@@ -72,6 +72,16 @@ def get_resource(client, resource_name, resource_id=None, resource_module_params
             id=resource_id,
             filter=get_args,
         )
+    elif resource_name == "server":
+        if "ipaddress" in get_args:
+            get_args.pop("ipaddress")
+        if "domain" in get_args:
+            get_args.pop("domain")
+        status_code, response_body = client.get(
+            resource=resource_name,
+            id=resource_id,
+            args=get_args,
+        )
     else:
         status_code, response_body = client.get(
             resource=resource_name,