ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-02 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

aci_spvpg: Various fixes to integration tests/modules (#36458)

Browse source 
* aci_spvpg: Various fixes to integration tests/modules

This PR includes:
- A fix in module_utils aci.py
- Various fixes in integration tests

* Fix typo
This commit is contained in:
Dag Wieers 2018-02-20 22:49:55 +01:00 • committed by GitHub
parent 2b6ac4561b
commit 1720a210e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/network/aci/aci.py
View file

@ -300,7 +300,6 @@ class ACIModule(object):
except Exception as e:
# Expose RAW output for troubleshooting
self.error = dict(code=-1, text="Unable to parse output as JSON, see 'raw' output. %s" % e)
# self.error = dict(code=str(self.status), text="Request failed: %s (see 'raw' output)" % self.response)
self.result['raw'] = rawoutput
return
@ -324,7 +323,6 @@ class ACIModule(object):
except Exception as e:
# Expose RAW output for troubleshooting
self.error = dict(code=-1, text="Unable to parse output as XML, see 'raw' output. %s" % e)
# self.error = dict(code=str(self.status), text="Request failed: %s (see 'raw' output)" % self.response)
self.result['raw'] = rawoutput
return
@ -750,7 +748,8 @@ class ACIModule(object):
"""
update_config = {child_class: {'attributes': {}}}
for key, value in proposed_child.items():
if value != existing_child[key]:
existing_field = existing_child.get(key)
if value != existing_field:
update_config[child_class]['attributes'][key] = value
if not update_config[child_class]['attributes']: