cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

os_server: Add some error checking for the 'nics' parameter

Browse source 
If this parameter was not of the right type, the module would fail with a
traceback, with a "AttributeError: 'str' object has no attribute 'get'"
exception.

It now gives a proper error message on type errors.
This commit is contained in:
Sam Thursfield 2015-05-29 16:59:12 +00:00
parent 11f4340a44
commit 6e9adc4687
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cloud/openstack/os_server.py
View file

@ -372,7 +372,14 @@ def _network_args(module, cloud):
args = [] args = []
nics = module.params['nics'] nics = module.params['nics']
if type(nics) != list:
module.fail_json(msg='The \'nics\' parameter must be a list.')
for net in _parse_nics(nics): for net in _parse_nics(nics):
if type(net) != dict:
module.fail_json(
msg='Each entry in the \'nics\' parameter must be a dict.')
if net.get('net-id'): if net.get('net-id'):
args.append(net) args.append(net)
elif net.get('net-name'): elif net.get('net-name'):