openstack
/
heat
Code Issues Proposed changes

Merge "Resolve AWS::EC2::Instance AZ output to a value if not specified"

This commit is contained in:
Jenkins 2014-09-26 08:13:40 +00:00 committed by Gerrit Code Review
parent 299f8a6639 db01dc264d
commit 9fdbf46824
4 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/engine/resources/instance.py
View File

@ -434,10 +434,26 @@ class Instance(resource.Resource):
return self.ipaddress or '0.0.0.0'
def _availability_zone(self):
'''
Return Server's Availability Zone, fetching it from Nova if necessary.
'''
availability_zone = self.properties[self.AVAILABILITY_ZONE]
if availability_zone is None:
try:
server = self.nova().servers.get(self.resource_id)
availability_zone = getattr(server,
'OS-EXT-AZ:availability_zone')
except Exception as e:
self.client_plugin().ignore_not_found(e)
return
return availability_zone
def _resolve_attribute(self, name):
res = None
if name == self.AVAILABILITY_ZONE_ATTR:
res = self.properties[self.AVAILABILITY_ZONE]
res = self._availability_zone()
elif name in self.ATTRIBUTES[1:]:
res = self._ipaddress()

21
heat/tests/test_instance.py
View File

@ -148,10 +148,13 @@ class InstancesTest(HeatTestCase):
self.assertTrue(instance.id > 0)
expected_ip = return_server.networks['public'][0]
expected_az = getattr(return_server, 'OS-EXT-AZ:availability_zone')
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
self.assertEqual(expected_az, instance.FnGetAtt('AvailabilityZone'))
self.m.VerifyAll()
@ -163,10 +166,13 @@ class InstancesTest(HeatTestCase):
self.assertTrue(instance.id > 0)
expected_ip = return_server.networks['public'][0]
expected_az = getattr(return_server, 'OS-EXT-AZ:availability_zone')
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
self.assertEqual(expected_az, instance.FnGetAtt('AvailabilityZone'))
self.m.VerifyAll()
@ -329,13 +335,28 @@ class InstancesTest(HeatTestCase):
self.assertTrue(instance.id > 0)
expected_ip = return_server.networks['public'][0]
expected_az = getattr(return_server, 'OS-EXT-AZ:availability_zone')
self.assertEqual(expected_ip, instance.FnGetAtt('PublicIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateIp'))
self.assertEqual(expected_ip, instance.FnGetAtt('PublicDnsName'))
self.assertEqual(expected_ip, instance.FnGetAtt('PrivateDnsName'))
self.assertEqual(expected_az, instance.FnGetAtt('AvailabilityZone'))
self.m.VerifyAll()
def test_instance_create_resolve_az_attribute(self):
return_server = self.fc.servers.list()[1]
instance = self._setup_test_instance(return_server,
'create_resolve_az_attribute')
self.m.ReplayAll()
scheduler.TaskRunner(instance.create)()
expected_az = getattr(return_server, 'OS-EXT-AZ:availability_zone')
actual_az = instance._availability_zone()
self.assertEqual(expected_az, actual_az)
self.m.VerifyAll()
def test_instance_create_image_name_err(self):
stack_name = 'test_instance_create_image_name_err_stack'
(tmpl, stack) = self._setup_test_stack(stack_name)

3
heat/tests/test_volume.py
View File

@ -219,11 +219,14 @@ class VolumeTest(BaseVolumeTest):
nova.NovaClientPlugin._create().AndReturn(self.fc)
self.m.StubOutWithMock(instance.Instance, 'handle_create')
self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
self.m.StubOutWithMock(instance.Instance, '_resolve_attribute')
self.m.StubOutWithMock(vol.VolumeAttachment, 'handle_create')
self.m.StubOutWithMock(vol.VolumeAttachment, 'check_create_complete')
instance.Instance.handle_create().AndReturn(None)
instance.Instance.check_create_complete(None).AndReturn(True)
instance.Instance._resolve_attribute(
'AvailabilityZone').MultipleTimes().AndReturn(None)
cinder.CinderClientPlugin._create().AndReturn(
self.cinder_fc)
self.stub_ImageConstraint_validate()

2
heat/tests/v1_1/fakes.py
View File

@ -109,6 +109,7 @@ class FakeHTTPClient(base_client.HTTPClient):
"Image Version": "2.1"}},
{"id": "5678",
"name": "sample-server2",
"OS-EXT-AZ:availability_zone": "nova2",
"OS-EXT-SRV-ATTR:instance_name":
"sample-server2",
"image": {"id": 2, "name": "sample image"},
@ -163,6 +164,7 @@ class FakeHTTPClient(base_client.HTTPClient):
"name": "sample-server3",
"OS-EXT-SRV-ATTR:instance_name":
"sample-server3",
"OS-EXT-AZ:availability_zone": "nova3",
"image": {"id": 3, "name": "sample image"},
"flavor": {"id": 3, "name": "m1.large"},
"hostId": "9e107d9d372bb6826bd81d3542a419d6",