summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2012-02-02 13:04:29 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2012-02-02 13:04:29 -0800
commit723cbc762a5e1d8d53e7e30223ee701dd65bd61c (patch)
tree500502b439130584a26b26cbfd07cd857622dfb7 /nova/api
parented516883faca1976acd6e5a9476d447d39e11ab9 (diff)
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
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/virtual_interfaces.py5
1 files changed, 4 insertions, 1 deletions
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}