wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cloudstack: fix wrong vpc found by name (#22603)

Browse source 
Fail fast if more than one VPC found with given identifier.
This commit is contained in:
René Moser 2017-03-14 16:18:32 +01:00 committed by GitHub
parent c5c0d9086e
commit 2be3418a81
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/cloudstack.py
View file

@ -235,12 +235,16 @@ class AnsibleCloudStack(object):
self.module.fail_json(msg="No VPCs available.")
for v in vpcs['vpc']:
if vpc in [v['displaytext'], v['name'], v['id']]:
self.vpc = v
return self._get_by_key(key, self.vpc)
if vpc in [v['name'], v['displaytext'], v['id']]:
# Fail if the identifyer matches more than one VPC
if self.vpc:
self.module.fail_json(msg="More than one VPC found with the provided identifyer '%s'" % vpc)
else:
self.vpc = v
if self.vpc:
return self._get_by_key(key, self.vpc)
self.module.fail_json(msg="VPC '%s' not found" % vpc)
def is_vm_in_vpc(self, vm):
for n in vm.get('nic'):
if n.get('isdefault', False):

9
lib/ansible/modules/cloud/cloudstack/cs_vpc.py
View file

@ -260,9 +260,12 @@ class AnsibleCloudStackVpc(AnsibleCloudStack):
if vpcs:
vpc_name = self.module.params.get('name')
for v in vpcs['vpc']:
if vpc_name.lower() in [v['name'].lower(), v['id']]:
self.vpc = v
break
if vpc_name in [v['name'], v['displaytext'], v['id']]:
# Fail if the identifyer matches more than one VPC
if self.vpc:
self.module.fail_json(msg="More than one VPC found with the provided identifyer '%s'" % vpc_name)
else:
self.vpc = v
return self.vpc
def restart_vpc(self):