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

cloudstack, cs_firewall: fix network not found error in return results (#2006)

Browse source 
Only a small issue in results.

In case of type is ingress, we rely on ip address, but in results we also return the network.
Resolving the ip address works without zone params. If the ip address is not located in the default zone and zone param is not set,
the network won't be found because default zone was used for the network query listing.

However since network param is not used for type ingress we skip the return of the network in results.
This commit is contained in:
René Moser 2016-04-12 18:46:52 +02:00
parent 30a46ee542
commit 0fa30f8d93
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cloud/cloudstack/cs_firewall.py
View file

@ -234,6 +234,7 @@ class AnsibleCloudStackFirewall(AnsibleCloudStack):
'icmptype': 'icmp_type',
}
self.firewall_rule = None
self.network = None
def get_firewall_rule(self):
@ -309,10 +310,11 @@ class AnsibleCloudStackFirewall(AnsibleCloudStack):
return cidr == rule['cidrlist']
def get_network(self, key=None, network=None):
if not network:
network = self.module.params.get('network')
def get_network(self, key=None):
if self.network:
return self._get_by_key(key, self.network)
network = self.module.params.get('network')
if not network:
return None
@ -328,6 +330,7 @@ class AnsibleCloudStackFirewall(AnsibleCloudStack):
for n in networks['network']:
if network in [ n['displaytext'], n['name'], n['id'] ]:
self.network = n
return self._get_by_key(key, n)
break
self.module.fail_json(msg="Network '%s' not found" % network)
@ -392,8 +395,8 @@ class AnsibleCloudStackFirewall(AnsibleCloudStack):
super(AnsibleCloudStackFirewall, self).get_result(firewall_rule)
if firewall_rule:
self.result['type'] = self.module.params.get('type')
if 'networkid' in firewall_rule:
self.result['network'] = self.get_network(key='displaytext', network=firewall_rule['networkid'])
if self.result['type'] == 'egress':
self.result['network'] = self.get_network(key='displaytext')
return self.result