From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Fri, 28 Oct 2011 02:10:17 +0000 (-0700)
Subject: Moved the initialization of the blade state so that the interfaces which are configur... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8cfd60e51c7a6b181f6ceda0b86f882970ade981;p=openstack-build%2Fneutron-build.git

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

Change-Id: Ib3381ea654e3ede7e138184e597cbf98860b049c
---

diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
index 68cd834c0..5e85a301d 100644
--- a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
@@ -167,6 +167,17 @@ class UCSInventory(L2NetworkDeviceInventoryBase):
             # marked as reserved, else we temporarily mark it as unreserved
             # based on the UCSM state, but may later change it if a port
             # 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] == \
                 const.BLADE_INTF_STATE_UNALLOCATED  or \
                 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] = \
                         const.BLADE_INTF_UNRESERVED
                 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:
                 blade_intf_data[blade_intf][const.BLADE_INTF_RESERVATION] = \
                         const.BLADE_INTF_RESERVED