x/tuskar-ui
Code Issues Proposed changes

Merge "Port quantum vif servers call to novaclient"

Browse Source
This commit is contained in:
Jenkins 2012-01-24 20:31:00 +00:00 committed by Gerrit Code Review
commit 54e0409b95
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/horizon/api/nova.py
View File

@ -397,6 +397,10 @@ def security_group_rule_delete(request, security_group_rule_id):
novaclient(request).security_group_rules.delete(security_group_rule_id)
def virtual_interfaces_list(request, instance_id):
return novaclient(request).virtual_interfaces.list(instance_id)
def volume_list(request):
return [Volume(vol) for vol in novaclient(request).volumes.list()]

3
horizon/horizon/api/quantum.py
View File

@ -28,7 +28,6 @@ from quantum import client as quantum_client
from horizon.api import nova
from horizon.api.base import *
from horizon.api.deprecated import extras_api
LOG = logging.getLogger(__name__)
@ -116,7 +115,7 @@ def get_vif_ids(request):
# Get virtual interface ids by instance
for instance in instances:
id = instance.id
instance_vifs = extras_api(request).virtual_interfaces.list(id)
instance_vifs = nova.virtual_interfaces_list(request, id)
for vif in instance_vifs:
# Check if this VIF is already connected to any port
if str(vif.id) in attached_vifs: