x/vmware-nsx
Code Issues Proposed changes

Merging from Sumit's branch, changes to VIF-driver and Scheduler; extension action names have been changed in response to Salvatore's review comments in the extensions branch review.

Browse Source
This commit is contained in:
Sumit Naiksatam 2011-08-25 20:37:33 -07:00
commit a5b924cc85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/plugins/cisco/nova/quantum_aware_scheduler.py
View File

@ -40,6 +40,7 @@ ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
'/extensions/csco/tenants/{tenant_id}'
TENANT_ID = 'nova'
CSCO_EXT_NAME = 'Cisco Nova Tenant'
ACTION = '/schedule_host'
class QuantumScheduler(driver.Scheduler):
@ -83,7 +84,7 @@ class QuantumScheduler(driver.Scheduler):
client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
action_prefix=ACTION_PREFIX_CSCO)
request_url = "/novatenants/" + project_id + "/get_host"
request_url = "/novatenants/" + project_id + ACTION
data = client.do_request('PUT', request_url, body=instance_data_dict)
hostname = data["host_list"]["host_1"]

3
quantum/plugins/cisco/nova/vifdirect.py
View File

@ -45,6 +45,7 @@ ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
'/extensions/csco/tenants/{tenant_id}'
TENANT_ID = 'nova'
CSCO_EXT_NAME = 'Cisco Nova Tenant'
ACTION = '/associate_port'
class Libvirt802dot1QbhDriver(VIFDriver):
@ -87,7 +88,7 @@ class Libvirt802dot1QbhDriver(VIFDriver):
client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
action_prefix=ACTION_PREFIX_CSCO)
request_url = "/novatenants/" + project_id + "/get_instance_port"
request_url = "/novatenants/" + project_id + ACTION
data = client.do_request('PUT', request_url, body=instance_data_dict)
device = data['vif_desc']['device']