summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibin Huang <haibin.huang@intel.com>2018-05-14 16:38:33 +0800
committerHaibin Huang <haibin.huang@intel.com>2018-05-14 16:42:17 +0800
commitc074758add133192a47d6af72966594194e482d1 (patch)
tree86c57a1cf1e423d3742570662c1ba6517f0fe4d6
parent6b2ce042cbd934635f97c9e3a75b7d144e5c3dfb (diff)
Fix hpa registration cloud_extra_info format
Change-Id: Ie597bc2b93a7538138558a38b33e1014c2364687 Issue-ID: MULTICLOUD-206 Signed-off-by: Haibin Huang <haibin.huang@intel.com>
-rw-r--r--ocata/ocata/registration/views/registration.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/ocata/ocata/registration/views/registration.py b/ocata/ocata/registration/views/registration.py
index 4d954cb1..bb898995 100644
--- a/ocata/ocata/registration/views/registration.py
+++ b/ocata/ocata/registration/views/registration.py
@@ -318,6 +318,13 @@ class Registry(newton_registration.Registry):
feature_uuid = uuid.uuid4()
cloud_extra_info_str = viminfo.get('cloud_extra_info')
+ if not isinstance(cloud_extra_info_str, dict):
+ try:
+ cloud_extra_info_str = json.loads(cloud_extra_info_str)
+ except Exception as ex:
+ logger.error("Can not convert cloud extra info %s %s" % (
+ str(ex), cloud_extra_info_str))
+ return {}
if cloud_extra_info_str :
cloud_dpdk_info = cloud_extra_info_str.get("ovsDpdk")
if cloud_dpdk_info :