Skip to content

Modified 'aci_rest' and 'aci_config_snapshot' modules to display the correct URL output string #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Modified 'aci_rest' and 'aci_config_snapshot' modules to display the correct URL output string #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91f8bf4
[minor_change] Modified 'aci_rest' and 'aci_config_snapshot' modules …
shrsr Oct 3, 2023
8bc0ba5
[minor_change] Modified 'aci_rest' module to display the correct URL …
shrsr Oct 3, 2023
4fb81a8
[ignore] Removed auxillary function to replace host from 'aci.py' and…
shrsr Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions plugins/modules/aci_config_snapshot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@ def main():
target_filter={"name": export_policy},
),
)
# Variable set for reuse of correct url in get_existing() triggered from exit_json() after query request
reset_url = aci.url

aci.get_existing()

aci.payload(
Expand All @@ -305,8 +304,6 @@ def main():
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

else:
# Prefix the proper url to export_policy
Expand Down
9 changes: 8 additions & 1 deletion plugins/modules/aci_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@

import json
import os
import re

try:
from ansible.module_utils.six.moves.urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
Expand Down Expand Up @@ -406,8 +407,11 @@ def main():
module.fail_json(msg="Failed to parse provided XML payload: {0}".format(to_text(e)), payload=payload)

# Perform actual request using auth cookie (Same as aci.request(), but also supports XML)
aci.url = "{0}/{1}".format(aci.base_url, path.lstrip("/"))
# NOTE By setting aci.path we ensure that Ansible displays accurate URL info when the plugin and the aci_rest module are used.
aci.path = path.lstrip("/")
aci.url = "{0}/{1}".format(aci.base_url, aci.path)
if aci.params.get("method") != "get" and not rsp_subtree_preserve:
aci.path = "{0}?rsp-subtree=modified".format(aci.path)
aci.url = update_qsl(aci.url, {"rsp-subtree": "modified"})

method = aci.params.get("method").upper()
Expand All @@ -434,6 +438,9 @@ def main():
aci.result["totalCount"] = aci.totalCount

else:
# NOTE A case when aci_rest is used with check mode and the apic host is used directly from the inventory
if aci.connection is not None and aci.params.get("host") is None:
aci.url = urlunparse(urlparse(aci.url)._replace(netloc=re.sub(r"[[\]]", "", aci.connection.get_option("host")).split(",")[0]))
aci.method = method
# Set changed to true so check_mode changed result is behaving similar to non aci_rest modules
aci.result["changed"] = True
Expand Down