Skip to content

Ability to disable query-target/rsp-subtree/rsp-prop-include in GET r… #102

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ability to disable query-target/rsp-subtree/rsp-prop-include in GET r… #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions src/rest/connector/libs/apic/implementation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,20 @@ def get(self, dn, query_target='self', rsp_subtree='no', \
"alias '{a}'".format(d=self.device.name,
a=self.alias))

full_url = "{f}{dn}?query-target={qt}&rsp-subtree={rs}"\
"&rsp-prop-include={rpi}"\
.format(f=self.url,
dn=dn,
qt=query_target,
rs=rsp_subtree,
rpi=rsp_prop_include)
full_url = "{f}{dn}".format(f=self.url, dn=dn.lstrip('/'))

if query_target:
full_url += "?query-target={qt}"\
.format(qt=query_target)

if rsp_subtree:
full_url += "&rsp-subtree={rs}"\
.format(rs=rsp_subtree)

if rsp_prop_include:
full_url += "&rsp-prop-include={rpi}"\
.format(rpi=rsp_prop_include)

if query_target_filter:
full_url += "&query-target-filter={qtf}"\
.format(qtf=query_target_filter)
Expand Down Expand Up @@ -313,7 +320,7 @@ def post(self, dn, payload, xml_payload=False,
"alias '{a}'".format(d=self.device.name,
a=self.alias))
# Deal with the dn
full_url = '{f}{dn}'.format(f=self.url, dn=dn)
full_url = '{f}{dn}'.format(f=self.url, dn=dn.lstrip('/'))

log.info("Sending POST command to '{d}':"\
"\nDN: {furl}\nPayload:{p}".format(d=self.device.name,
Expand Down Expand Up @@ -375,7 +382,7 @@ def delete(self, dn, expected_status_code=requests.codes.ok, timeout=30):
a=self.alias))

# Deal with the dn
full_url = '{f}{dn}'.format(f=self.url, dn=dn)
full_url = '{f}{dn}'.format(f=self.url, dn=dn.lstrip('/'))

log.info("Sending DELETE command to '{d}':"\
"\nDN: {furl}".format(d=self.device.name, furl=full_url))
Expand Down
25 changes: 16 additions & 9 deletions src/rest/connector/libs/nxos/aci/implementation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,20 @@ def get(self, dn, query_target='self', rsp_subtree='no', \
"alias '{a}'".format(d=self.device.name,
a=self.alias))

full_url = "{f}{dn}?query-target={qt}&rsp-subtree={rs}"\
"&rsp-prop-include={rpi}"\
.format(f=self.url,
dn=dn,
qt=query_target,
rs=rsp_subtree,
rpi=rsp_prop_include)
full_url = "{f}{dn}".format(f=self.url, dn=dn.lstrip('/'))

if query_target:
full_url += "?query-target={qt}"\
.format(qt=query_target)

if rsp_subtree:
full_url += "&rsp-subtree={rs}"\
.format(rs=rsp_subtree)

if rsp_prop_include:
full_url += "&rsp-prop-include={rpi}"\
.format(rpi=rsp_prop_include)

if query_target_filter:
full_url += "&query-target-filter={qtf}"\
.format(qtf=query_target_filter)
Expand Down Expand Up @@ -293,7 +300,7 @@ def post(self, dn, payload, expected_status_code=requests.codes.ok,
"alias '{a}'".format(d=self.device.name,
a=self.alias))
# Deal with the dn
full_url = '{f}{dn}'.format(f=self.url, dn=dn)
full_url = '{f}{dn}'.format(f=self.url, dn=dn.lstrip('/'))

log.info("Sending POST command to '{d}':"\
"\nDN: {furl}\nPayload:{p}".format(d=self.device.name,
Expand Down Expand Up @@ -338,7 +345,7 @@ def delete(self, dn, expected_status_code=requests.codes.ok, timeout=30):
a=self.alias))

# Deal with the dn
full_url = '{f}{dn}'.format(f=self.url, dn=dn)
full_url = '{f}{dn}'.format(f=self.url, dn=dn.lstrip('/'))

log.info("Sending DELETE command to '{d}':"\
"\nDN: {furl}".format(d=self.device.name, furl=full_url))
Expand Down