Merge "Fix divergence in attach_interfaces extensions"

This commit is contained in:
Jenkins
2013-10-24 06:16:46 +00:00
committed by Gerrit Code Review

View File

@@ -103,7 +103,7 @@ class InterfaceAttachmentController(object):
try:
instance = self.compute_api.get(context, server_id)
LOG.audit(_("Attach interface to %s"), instance=instance)
port_info = self.compute_api.attach_interface(context,
vif = self.compute_api.attach_interface(context,
instance, network_id, port_id, req_ip)
except exception.InstanceNotFound as err:
raise exc.HTTPNotFound(explanation=err.format_message())
@@ -114,7 +114,7 @@ class InterfaceAttachmentController(object):
raise webob.exc.HTTPInternalServerError(
explanation=e.format_message())
return self.show(req, server_id, port_info['id'])
return self.show(req, server_id, vif['id'])
def update(self, req, server_id, id, body):
"""Update a interface attachment. We don't currently support this."""