Fixing the extensions URL to 1.0 and pep8 error.

diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index b860ed26036b70f674b1470e250c629c8c7da41f..4394980dfa17b8a9300dd60593ff595a556b8dd8 100644 (file)
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -35,7 +35,7 @@ flags.DEFINE_integer('quantum_port', 9696,
 HOST = FLAGS.quantum_host
 PORT = FLAGS.quantum_port
 USE_SSL = False
-ACTION_PREFIX_EXT = '/v0.1'
+ACTION_PREFIX_EXT = '/v1.0'
 ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
         '/extensions/csco/tenants/{tenant_id}'
 TENANT_ID = 'nova'

diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index 44842f8edd92543fa0d671c5508ca5df355c2d1b..015c9acebf65f1dc5bdaeef38d31d3315784f21d 100644 (file)
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -40,7 +40,7 @@ HOST = FLAGS.quantum_host
 PORT = FLAGS.quantum_port
 USE_SSL = False
 TENANT_ID = 'nova'
-ACTION_PREFIX_EXT = '/v0.1'
+ACTION_PREFIX_EXT = '/v1.0'
 ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
         '/extensions/csco/tenants/{tenant_id}'
 TENANT_ID = 'nova'

diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
index 1a631717e33565b46a222737b23a926a0fd64061..1ed5e347d95e983bbfbf97ffee1f4fb79d27586e 100644 (file)
--- a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
@@ -287,7 +287,7 @@ class UCSInventory(L2NetworkDeviceInventoryBase):
                            blade_intf_data[blade_intf]\
                            [const.TENANTID] == tenant_id and \
                            blade_intf_data[blade_intf]\
-                           [const.INSTANCE_ID] == instance_id :
+                           [const.INSTANCE_ID] == instance_id:
                             found_blade_intf_data = blade_intf_data
                             LOG.debug("Found blade %s associated with this" \
                                       " instance: %s" % \