[ignore] restructure code of aci_config_snapshot for code coverage improvement and introduction of base_url property to aci class for reuse of protocol/host with optional port combination

Author: akinross

plugins/module_utils/aci.py

@@ -361,6 +361,11 @@ def __init__(self, module):
             self.module.warn("Enable debug output because ANSIBLE_DEBUG was set.")
             self.params["output_level"] = "debug"
 
+        if self.params.get("port") is not None:
+            self.base_url = "{protocol}://{host}:{port}".format_map(self.params)
+        else:
+            self.base_url = "{protocol}://{host}".format_map(self.params)
+
         if self.params.get("private_key"):
             # Perform signature-based authentication, no need to log on separately
             if not HAS_CRYPTOGRAPHY and not HAS_OPENSSL:
@@ -415,10 +420,7 @@ def login(self):
         """Log in to APIC"""
 
         # Perform login request
-        if self.params.get("port") is not None:
-            url = "{protocol}://{host}:{port}/api/aaaLogin.json".format_map(self.params)
-        else:
-            url = "{protocol}://{host}/api/aaaLogin.json".format_map(self.params)
+        url = "{0}/api/aaaLogin.json".format(self.base_url)
         payload = {
             "aaaUser": {
                 "attributes": {

plugins/modules/aci_config_snapshot.py

@@ -227,8 +227,6 @@
   sample: https://10.11.12.13/api/mo/uni/tn-production.json
 """
 
-import json
-
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec, aci_annotation_spec
 
@@ -304,18 +302,9 @@ def main():
         aci.post_config()
 
         # Query for job information and add to results
-        path = "/api/node/mo/uni/backupst/jobs-[uni/fabric/configexp-{0}].json".format(export_policy)
-        if "port" in aci.params and aci.params.get("port") is not None:
-            port_url = "{protocol}://{host}:{port}/".format_map(aci.params) + path.lstrip("/")
-        else:
-            port_url = "{protocol}://{host}/".format_map(aci.params) + path.lstrip("/")
-        resp, info = aci.api_call("GET", port_url, data=None, return_response=True)
-        try:
-            aci.imdata = json.loads(resp.read())["imdata"]
-        except AttributeError:
-            aci.imdata = json.loads(info.get("body"))["imdata"]
-
-        aci.result["job_details"] = aci.imdata[0].get("configJobCont", {})
+        path = "api/node/mo/uni/backupst/jobs-[uni/fabric/configexp-{0}].json".format(export_policy)
+        aci.api_call("GET", url="{0}/{1}".format(aci.base_url, path))
+        aci.result["job_details"] = aci.existing[0].get("configJobCont", {})
         # Reset state and url to display correct in output and trigger get_existing() function with correct url
         aci.url = reset_url