Merge "Add instance to several log messages."

This commit is contained in:
Jenkins 2012-04-27 09:13:05 +00:00 committed by Gerrit Code Review
commit 5491507f30

View File

@ -308,7 +308,8 @@ class VolumeAttachmentController(object):
instance = vol['instance']
if instance is None or str(instance['uuid']) != server_id:
LOG.debug("instance_id != server_id")
LOG.debug("Instance not found (server_id=%(server_id)s)",
{'server_id': server_id}, instance=instance)
raise exc.HTTPNotFound()
return {'volumeAttachment': _translate_attachment_detail_view(context,
@ -372,7 +373,8 @@ class VolumeAttachmentController(object):
instance = vol['instance']
if instance is None or str(instance['uuid']) != server_id:
LOG.debug("instance_id != server_id")
LOG.debug("Instance not found (server_id=%(server_id)s)",
{'server_id': server_id}, instance=instance)
raise exc.HTTPNotFound()
self.compute_api.detach_volume(context,