summaryrefslogtreecommitdiffstats
path: root/newton/newton/registration
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-10-23 17:33:20 +0800
committerBin Yang <bin.yang@windriver.com>2017-10-23 17:33:20 +0800
commitd0fcc2312d1f54bed254f186a0baef522e420f63 (patch)
tree7487d11066c8835492fe091f72393b2f93f599c2 /newton/newton/registration
parenta278a76179ff06861df81643ef1cf4fc6e3ef3ea (diff)
Add DNSaaS delegate service
Change-Id: Ifec8958a07a30b58602e242c1769ba4ece5677cd Issue-Id: MULTICLOUD-106 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton/newton/registration')
-rw-r--r--newton/newton/registration/views/registration.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/newton/newton/registration/views/registration.py b/newton/newton/registration/views/registration.py
index 0bdc0fcd..0a9f7f8e 100644
--- a/newton/newton/registration/views/registration.py
+++ b/newton/newton/registration/views/registration.py
@@ -555,9 +555,10 @@ class Registry(APIView):
def _discover_epa_resources(self, vimid="", viminfo=None):
try:
cloud_epa_caps_info = {}
- cloud_extra_info = viminfo.get('cloud_extra_info')
- if cloud_extra_info:
- cloud_epa_caps_info.update(json.loads(cloud_extra_info))
+ cloud_extra_info_str = viminfo.get('cloud_extra_info')
+ if cloud_extra_info_str:
+ cloud_extra_info = json.loads(cloud_extra_info_str)
+ cloud_epa_caps_info.update(cloud_extra_info.get("epa-caps"))
cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid)
ret = self._update_epa_caps(cloud_owner, cloud_region_id,