From 723cbc762a5e1d8d53e7e30223ee701dd65bd61c Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 2 Feb 2012 13:04:29 -0800 Subject: Fixes uuid lookup in virtual interfaces extension * Makes virtual interfaces get the instance and pass it to network.api * Sends the id from the instance when looking up vifs * Repairs the tests * Fixes bug 925682 Change-Id: If25514246f30bfc983f26f7a8f1c35f33f8b9cc4 --- nova/api/openstack/compute/contrib/virtual_interfaces.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py index e8da23c00..9cf31e669 100644 --- a/nova/api/openstack/compute/contrib/virtual_interfaces.py +++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py @@ -19,6 +19,7 @@ from nova.api.openstack import common from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil +from nova import compute from nova import log as logging from nova import network @@ -54,6 +55,7 @@ class ServerVirtualInterfaceController(object): """ def __init__(self): + self.compute_api = compute.API() self.network_api = network.API() super(ServerVirtualInterfaceController, self).__init__() @@ -61,7 +63,8 @@ class ServerVirtualInterfaceController(object): """Returns a list of VIFs, transformed through entity_maker.""" context = req.environ['nova.context'] - vifs = self.network_api.get_vifs_by_instance(context, server_id) + instance = self.compute_api.get(context, server_id) + vifs = self.network_api.get_vifs_by_instance(context, instance) limited_list = common.limited(vifs, req) res = [entity_maker(context, vif) for vif in limited_list] return {'virtual_interfaces': res} -- cgit