Merge "Avoid lazy-loading instance.id when cross_az_attach=False" into stable/ocata

This commit is contained in:
Jenkins 2017-06-06 14:45:15 +00:00 committed by Gerrit Code Review
commit 3172fdb67b
2 changed files with 4 additions and 1 deletions

View File

@ -201,6 +201,9 @@ class CinderApiTestCase(test.NoDBTestCase):
'attach_status': 'detached',
'availability_zone': 'zone2'}
instance = fake_instance_obj(self.ctx)
# Simulate _provision_instances in the compute API; the instance is not
# created in the API so the instance will not have an id attribute set.
delattr(instance, 'id')
self.assertRaises(exception.InvalidVolume,
self.api.check_availability_zone,

View File

@ -278,7 +278,7 @@ class API(object):
msg = _("Instance %(instance)s and volume %(vol)s are not in "
"the same availability_zone. Instance is in "
"%(ins_zone)s. Volume is in %(vol_zone)s") % {
"instance": instance['id'],
"instance": instance.uuid,
"vol": volume['id'],
'ins_zone': instance_az,
'vol_zone': volume['availability_zone']}