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

Various small fixes to MSC modules and tests (#48417)

Browse source
This commit is contained in:
Dag Wieers 2018-11-13 09:01:45 +01:00 • committed by GitHub
parent 475844d1ae
commit 24d7b4a660
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 76 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/module_utils/network/aci/msc.py
View file

@ -186,9 +186,9 @@ class MSCModule(object):
except:
payload = json.loads(info['body'])
if 'code' in payload:
self.fail_json(msg='MSC Error {code}: {message} [{info}]'.format(**payload), payload=data)
self.fail_json(msg='MSC Error {code}: {message}'.format(**payload), data=data, info=info, payload=payload)
else:
self.fail_json(msg='MSC Error:'.format(**payload), info=info, output=output)
self.fail_json(msg='MSC Error:'.format(**payload), data=data, info=info, payload=payload)
return {}
@ -213,18 +213,20 @@ class MSCModule(object):
self.fail_json(msg='More than one object matches unique filter: {0}'.format(kwargs))
return objs[0]
def sanitize(self, updates, collate=False):
def sanitize(self, updates, collate=False, required_keys=None):
if required_keys is None:
required_keys = []
self.proposed = deepcopy(self.existing)
self.sent = deepcopy(self.existing)
# Clean up self.sent
for key in updates:
# Always retain 'id'
if key in ('id'):
if key in required_keys:
pass
# Remove unspecified values
elif updates[key] is None:
elif not collate and updates[key] is None:
if key in self.existing:
del(self.sent[key])
continue
@ -265,8 +267,8 @@ class MSCModule(object):
if self.module._diff:
self.result['diff'] = dict(
before=self.existing,
after=self.sent,
before=self.previous,
after=self.existing,
)
self.result.update(**kwargs)