aci_rest: Fix ignoring custom port

This commit is contained in:
Dag Wieers 2018-12-10 13:05:06 +01:00 committed by Toshio Kuratomi
parent db8f13c702
commit 2ba095f89e
2 changed files with 8 additions and 2 deletions

View file

@ -0,0 +1,3 @@
---
bugfixes:
- aci_rest - Fix issue ignoring custom port

View file

@ -387,7 +387,10 @@ def main():
except Exception as e: except Exception as e:
module.fail_json(msg='Failed to parse provided XML payload: %s' % to_text(e), payload=payload) module.fail_json(msg='Failed to parse provided XML payload: %s' % to_text(e), payload=payload)
# Perform actual request using auth cookie (Same as aci_request, but also supports XML) # Perform actual request using auth cookie (Same as aci.request(), but also supports XML)
if 'port' in aci.params and aci.params['port'] is not None:
aci.url = '%(protocol)s://%(host)s:%(port)s/' % aci.params + path.lstrip('/')
else:
aci.url = '%(protocol)s://%(host)s/' % aci.params + path.lstrip('/') aci.url = '%(protocol)s://%(host)s/' % aci.params + path.lstrip('/')
if aci.params['method'] != 'get': if aci.params['method'] != 'get':
path += '?rsp-subtree=modified' path += '?rsp-subtree=modified'