openstack
/
heat
Code Issues Proposed changes

Fix creation of security group and rules 

When the group or rule already exists, The Nova API and client errored out.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
This commit is contained in:
Tomas Sedovic 2012-04-16 15:10:31 +02:00
parent dfe12cbaba
commit b26a067626
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
heat/engine/resources.py
View File

@ -28,6 +28,7 @@ from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
from novaclient.v1_1 import client
from novaclient.exceptions import BadRequest
from heat.common import exception
from heat.db import api as db_api
@ -208,16 +209,31 @@ class SecurityGroup(Resource):
self.state_set(self.CREATE_IN_PROGRESS)
Resource.create(self)
sec = self.nova().security_groups.create(self.name, self.description)
groups = self.nova().security_groups.list()
for group in groups:
if group.name == self.name:
sec = group
break
if not sec:
sec = self.nova().security_groups.create(self.name, self.description)
self.instance_id_set(sec.id)
if 'SecurityGroupIngress' in self.t['Properties']:
rules_client = self.nova().security_group_rules
for i in self.t['Properties']['SecurityGroupIngress']:
rule = self.nova().security_group_rules.create(sec.id,
i['IpProtocol'],
i['FromPort'],
i['ToPort'],
i['CidrIp'])
try:
rule = rules_client.create(sec.id,
i['IpProtocol'],
i['FromPort'],
i['ToPort'],
i['CidrIp'])
except BadRequest as ex:
if ex.message.find('already exists') >= 0:
pass # no worries, the rule is already there
else:
raise # unexpected error
self.state_set(self.CREATE_COMPLETE)
def delete(self):