openstack/nova
Code Issues Proposed changes

Consolidate code to get the correct availability zone of an instance

Browse Source 
This makes getting the availability zone of an instance use the same
code by placing it inside the helper get_instance_availability_zone().

Related-Bug: #1390033
Change-Id: I69b98eacbc8dc91e65611d6bf07272b517fe350d
This commit is contained in:
Hans Lindgren 2014-11-24 12:03:32 +01:00 committed by Sylvain Bauza
parent e68db1157a
commit 479005ce5a
7 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/api/openstack/compute/extended_availability_zone.py
View File

@ -28,12 +28,7 @@ class ExtendedAZController(wsgi.Controller):
def _extend_server(self, context, server, instance):
key = "%s:availability_zone" % PREFIX
az = avail_zone.get_instance_availability_zone(context, instance)
if not az and instance.get('availability_zone'):
# Likely hasn't reached a viable compute node yet so give back the
# desired availability_zone that *may* exist in the instance
# record itself.
az = instance.availability_zone
server[key] = az
server[key] = az or ''
@wsgi.extends
def show(self, req, resp_obj, id):

7
nova/api/openstack/compute/legacy_v2/contrib/extended_availability_zone.py
View File

@ -27,12 +27,7 @@ class ExtendedAZController(wsgi.Controller):
def _extend_server(self, context, server, instance):
key = "%s:availability_zone" % Extended_availability_zone.alias
az = avail_zone.get_instance_availability_zone(context, instance)
if not az and instance.get('availability_zone'):
# Likely hasn't reached a viable compute node yet so give back the
# desired availability_zone that *may* exist in the instance
# record itself.
az = instance.availability_zone
server[key] = az
server[key] = az or ''
@wsgi.extends
def show(self, req, resp_obj, id):

8
nova/availability_zones.py
View File

@ -167,9 +167,13 @@ def get_availability_zones(context, get_only_available=False,
def get_instance_availability_zone(context, instance):
"""Return availability zone of specified instance."""
host = str(instance.get('host'))
host = instance.get('host')
if not host:
return None
# Likely hasn't reached a viable compute node yet so give back the
# desired availability_zone in the instance record if the boot request
# specified one.
az = instance.get('availability_zone')
return az
cache_key = _make_cache_key(host)
cache = _get_cache()

4
nova/tests/unit/api/openstack/compute/test_extended_availability_zone.py
View File

@ -114,12 +114,10 @@ class ExtendedAvailabilityZoneTestV21(test.TestCase):
res = self._make_request(url)
self.assertEqual(res.status_int, 200)
self.assertAvailabilityZone(self._get_server(res.body), 'fakeaz')
self.assertAvailabilityZone(self._get_server(res.body), '')
def test_show_empty_host_az(self):
self.stubs.Set(compute.api.API, 'get', fake_compute_get_empty)
self.stubs.Set(availability_zones, 'get_host_availability_zone',
fake_get_no_host_availability_zone)
url = self.base_url + UUID3
res = self._make_request(url)

22
nova/tests/unit/test_availability_zones.py
View File

@ -23,8 +23,8 @@ import six
from nova import availability_zones as az
from nova import context
from nova import db
from nova import objects
from nova import test
from nova.tests.unit.api.openstack import fakes
CONF = cfg.CONF
CONF.import_opt('internal_service_availability_zone',
@ -239,8 +239,7 @@ class AvailabilityZoneTestCases(test.TestCase):
def test_get_instance_availability_zone_default_value(self):
"""Test get right availability zone by given an instance."""
fake_inst_id = 162
fake_inst = fakes.stub_instance(fake_inst_id, host=self.host)
fake_inst = objects.Instance(host=self.host)
self.assertEqual(self.default_az,
az.get_instance_availability_zone(self.context, fake_inst))
@ -251,8 +250,21 @@ class AvailabilityZoneTestCases(test.TestCase):
service = self._create_service_with_topic('compute', host)
self._add_to_aggregate(service, self.agg)
fake_inst_id = 174
fake_inst = fakes.stub_instance(fake_inst_id, host=host)
fake_inst = objects.Instance(host=host)
self.assertEqual(self.availability_zone,
az.get_instance_availability_zone(self.context, fake_inst))
def test_get_instance_availability_zone_no_host(self):
"""Test get availability zone from instance if host not set."""
fake_inst = objects.Instance(host=None, availability_zone='inst-az')
result = az.get_instance_availability_zone(self.context, fake_inst)
self.assertEqual('inst-az', result)
def test_get_instance_availability_zone_no_host_no_az(self):
"""Test get availability zone if neither host nor az is set."""
fake_inst = objects.Instance(host=None, availability_zone=None)
result = az.get_instance_availability_zone(self.context, fake_inst)
self.assertIsNone(result)

5
nova/tests/unit/volume/test_cinder.py
View File

@ -175,11 +175,12 @@ class CinderApiTestCase(test.NoDBTestCase):
volume['availability_zone'] = 'zone1'
self.assertIsNone(self.api.check_attach(
self.ctx, volume, instance))
self.assertFalse(mock_get_instance_az.called)
mock_get_instance_az.assert_called_once_with(self.ctx, instance)
mock_get_instance_az.reset_mock()
volume['availability_zone'] = 'zone2'
self.assertRaises(exception.InvalidVolume,
self.api.check_attach, self.ctx, volume, instance)
self.assertFalse(mock_get_instance_az.called)
mock_get_instance_az.assert_called_once_with(self.ctx, instance)
cinder.CONF.reset()
def test_check_attach(self):

8
nova/volume/cinder.py
View File

@ -293,13 +293,7 @@ class API(object):
msg = _("volume %s already attached") % volume['id']
raise exception.InvalidVolume(reason=msg)
if instance and not CONF.cinder.cross_az_attach:
# NOTE(sorrison): If instance is on a host we match against it's AZ
# else we check the intended AZ
if instance.get('host'):
instance_az = az.get_instance_availability_zone(
context, instance)
else:
instance_az = instance['availability_zone']
instance_az = az.get_instance_availability_zone(context, instance)
if instance_az != volume['availability_zone']:
msg = _("Instance %(instance)s and volume %(vol)s are not in "
"the same availability_zone. Instance is in "