openstack/deb-heat
Code Issues Proposed changes

Merge "Make Server compatible with Nova Key Pair resource"

Browse Source
This commit is contained in:
Jenkins 2014-02-09 22:24:15 +00:00 committed by Gerrit Code Review
commit 139206d177
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/resources/nova_keypair.py
View File

@ -120,6 +120,9 @@ class KeyPair(resource.Resource):
'public_key': self.public_key}
return unicode(attr_fn[key])
def FnGetRefId(self):
return self.resource_id
def resource_mapping():
return {'OS::Nova::KeyPair': KeyPair}

61
heat/tests/test_server.py
View File

@ -455,6 +455,67 @@ class ServersTest(HeatTestCase):
'instance server_with_bootable_volume', str(ex))
self.m.VerifyAll()
def test_server_validate_with_nova_keypair_resource(self):
stack_name = 'srv_val_test'
nova_keypair_template = '''
{
"AWSTemplateFormatVersion" : "2010-09-09",
"Description" : "WordPress",
"Resources" : {
"WebServer": {
"Type": "OS::Nova::Server",
"Properties": {
"image" : "F17-x86_64-gold",
"flavor" : "m1.large",
"key_name" : { "Ref": "SSHKey" },
"user_data" : "wordpress"
}
},
"SSHKey": {
"Type": "OS::Nova::KeyPair",
"Properties": {
"name": "my_key"
}
}
}
}
'''
t = template_format.parse(nova_keypair_template)
template = parser.Template(t)
stack = parser.Stack(utils.dummy_context(), stack_name, template,
stack_id=str(uuid.uuid4()))
server = servers.Server('server_validate_test',
t['Resources']['WebServer'], stack)
self.m.StubOutWithMock(server, 'nova')
server.nova().MultipleTimes().AndReturn(self.fc)
self.m.ReplayAll()
self.assertIsNone(server.validate())
self.m.VerifyAll()
def test_server_validate_with_invalid_ssh_key(self):
stack_name = 'srv_val_test'
(t, stack) = self._setup_test_stack(stack_name)
web_server = t['Resources']['WebServer']
# Make the ssh key have an invalid name
web_server['Properties']['key_name'] = 'test2'
server = servers.Server('server_validate_test',
t['Resources']['WebServer'], stack)
self.m.StubOutWithMock(server, 'nova')
server.nova().MultipleTimes().AndReturn(self.fc)
self.m.ReplayAll()
ex = self.assertRaises(exception.UserKeyPairMissing,
server.validate)
self.assertIn("The Key (test2) could not be found.", str(ex))
self.m.VerifyAll()
def test_server_validate_delete_policy(self):
stack_name = 'srv_val_delpol'
(t, stack) = self._setup_test_stack(stack_name)