Merge "Avoid lazy-loading instance.id when cross_az_attach=False"
This commit is contained in:
commit
933c2c5c5e
|
@ -189,6 +189,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,
|
||||
|
|
|
@ -288,7 +288,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']}
|
||||
|
|
Loading…
Reference in New Issue