openstack/neutron-vpnaas
Code Issues Proposed changes

Merge "Moved the initialization of the blade state so that the interfaces which are configured outside of Quantum are also initialized in the blade state."

Browse Source
This commit is contained in:
Jenkins 2011-10-28 20:17:21 +00:00 committed by Gerrit Code Review
commit e767b8f463
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
View File

@ -167,6 +167,17 @@ class UCSInventory(L2NetworkDeviceInventoryBase):
# marked as reserved, else we temporarily mark it as unreserved # marked as reserved, else we temporarily mark it as unreserved
# based on the UCSM state, but may later change it if a port # based on the UCSM state, but may later change it if a port
# association is found in the DB # association is found in the DB
if not const.TENANTID in blade_intf_data[blade_intf].keys():
blade_intf_data[blade_intf][const.TENANTID] = None
if not const.PORTID in blade_intf_data[blade_intf].keys():
blade_intf_data[blade_intf][const.PORTID] = None
if not const.PROFILE_ID in blade_intf_data[blade_intf].keys():
blade_intf_data[blade_intf][const.PROFILE_ID] = None
if not const.INSTANCE_ID in blade_intf_data[blade_intf].keys():
blade_intf_data[blade_intf][const.INSTANCE_ID] = None
if not const.VIF_ID in blade_intf_data[blade_intf].keys():
blade_intf_data[blade_intf][const.VIF_ID] = None
if (blade_intf_data[blade_intf][const.BLADE_INTF_LINK_STATE] == \ if (blade_intf_data[blade_intf][const.BLADE_INTF_LINK_STATE] == \
const.BLADE_INTF_STATE_UNALLOCATED or \ const.BLADE_INTF_STATE_UNALLOCATED or \
blade_intf_data[blade_intf][const.BLADE_INTF_LINK_STATE] == \ blade_intf_data[blade_intf][const.BLADE_INTF_LINK_STATE] == \
@ -176,11 +187,6 @@ class UCSInventory(L2NetworkDeviceInventoryBase):
blade_intf_data[blade_intf][const.BLADE_INTF_RESERVATION] = \ blade_intf_data[blade_intf][const.BLADE_INTF_RESERVATION] = \
const.BLADE_INTF_UNRESERVED const.BLADE_INTF_UNRESERVED
unreserved_counter += 1 unreserved_counter += 1
blade_intf_data[blade_intf][const.TENANTID] = None
blade_intf_data[blade_intf][const.PORTID] = None
blade_intf_data[blade_intf][const.PROFILE_ID] = None
blade_intf_data[blade_intf][const.INSTANCE_ID] = None
blade_intf_data[blade_intf][const.VIF_ID] = None
else: else:
blade_intf_data[blade_intf][const.BLADE_INTF_RESERVATION] = \ blade_intf_data[blade_intf][const.BLADE_INTF_RESERVATION] = \
const.BLADE_INTF_RESERVED const.BLADE_INTF_RESERVED