Change SecurityGroups to be passed directly to nova

This changes SecurityGroups to return the complete name
of a resource (stack.name).

Change-Id: I945f1213b3ddcb5550e7b4ed3d982d4ee7c4e912
This commit is contained in:
Jeff Peeler 2013-05-21 15:52:41 -04:00
parent 8cc5b6bb72
commit 3ea48c23c0
4 changed files with 6 additions and 17 deletions

View File

@ -405,12 +405,6 @@ class Resource(object):
def physical_resource_name(self):
return '%s.%s' % (self.stack.name, self.name)
def physical_resource_name_find(self, resource_name):
if resource_name in self.stack:
return '%s.%s' % (self.stack.name, resource_name)
else:
raise IndexError('no such resource')
def validate(self):
logger.info('Validating %s' % str(self))

View File

@ -272,12 +272,7 @@ class Instance(resource.Resource):
return nics
def handle_create(self):
if self.properties.get('SecurityGroups') is None:
security_groups = None
else:
security_groups = [self.physical_resource_name_find(sg)
for sg in self.properties.get('SecurityGroups')]
security_groups = self.properties.get('SecurityGroups')
userdata = self.properties['UserData'] or ''
flavor = self.properties['InstanceType']
key_name = self.properties['KeyName']

View File

@ -179,7 +179,7 @@ class SecurityGroup(resource.Resource):
self.resource_id = None
def FnGetRefId(self):
return unicode(self.name)
return self.physical_resource_name()
def resource_mapping():

View File

@ -195,7 +195,7 @@ Resources:
sg = stack['the_sg']
self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
self.assertResourceState(sg, 'the_sg')
self.assertResourceState(sg, 'test_stack.the_sg')
stack.delete()
self.m.VerifyAll()
@ -268,7 +268,7 @@ Resources:
sg = stack['the_sg']
self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
self.assertResourceState(sg, 'the_sg')
self.assertResourceState(sg, 'test_stack.the_sg')
self.assertEqual(None, sg.delete())
@ -412,7 +412,7 @@ Resources:
sg = stack['the_sg']
self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
self.assertResourceState(sg, 'the_sg')
self.assertResourceState(sg, 'test_stack.the_sg')
stack.delete()
self.m.VerifyAll()
@ -528,7 +528,7 @@ Resources:
sg = stack['the_sg']
self.assertRaises(resource.UpdateReplace, sg.handle_update, {}, {}, {})
self.assertResourceState(sg, 'the_sg')
self.assertResourceState(sg, 'test_stack.the_sg')
self.assertEqual(None, sg.delete())