From: Bin Yang <bin.yang@windriver.com>
Date: Wed, 3 Apr 2019 09:21:26 +0000 (+0000)
Subject: Fix capacity_check error
X-Git-Tag: 1.3.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F84060%2F1;p=multicloud%2Fopenstack.git

Fix capacity_check error

Change-Id: Ib317e2a655d571b7cfefc1dbe8631ed77acc4b81
Issue-ID: MULTICLOUD-542
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---

diff --git a/share/starlingx_base/resource/capacity.py b/share/starlingx_base/resource/capacity.py
index fc926d00..46e5eba5 100644
--- a/share/starlingx_base/resource/capacity.py
+++ b/share/starlingx_base/resource/capacity.py
@@ -66,11 +66,15 @@ class CapacityCheck(newton_capacity.CapacityCheck):
             vimAzCacheKey = "cap_azlist_" + vimid
             vimAzListCacheStr = cache.get(vimAzCacheKey)
             vimAzListCache = json.loads(vimAzListCacheStr) if vimAzListCacheStr else []
+            azCapInfoList = []
             for azName in vimAzListCache:
                 azCapCacheKey = "cap_" + vimid + "_" + azName
                 azCapInfoCacheStr = cache.get(azCapCacheKey)
+                if not azCapInfoCacheStr:
+                    continue
                 azCapInfoCache = json.loads(azCapInfoCacheStr) if azCapInfoCacheStr else None
 
+                azCapInfo = {}
                 azCapInfo["availability-zone-name"] = azName
                 azCapInfo["vCPUAvail"] = azCapInfoCache.get("vcpus", 0) + azCapInfoCache.get("vcpus_used", 0)
                 azCapInfo["vCPUTotal"] = azCapInfoCache.get("vcpus", 0)
@@ -78,8 +82,9 @@ class CapacityCheck(newton_capacity.CapacityCheck):
                 azCapInfo["MemoryTotal"] = azCapInfoCache.get("vcpus", 0)
                 azCapInfo["StorageAvail"] = azCapInfoCache.get("vcpus", 0)
                 azCapInfo["StorageTotal"] = azCapInfoCache.get("vcpus", 0)
+                azCapInfoList.append(azCapInfo)
 
-            return azCapInfo
+            return azCapInfoList
         except Exception as e:
             return azCapInfo
             pass