From 591cdc9da7149fa4e68eac0de2efa8efd25281d6 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Thu, 16 Aug 2018 04:32:18 +0000 Subject: multi-region discovery Decouple the openstack region id from cloud-region-id Change-Id: If4bfacf05d87ca4bc97a485d4153f4f379ad451a Issue-ID: MULTICLOUD-311 Signed-off-by: Bin Yang --- share/common/msapi/extsys.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share/common/msapi/extsys.py') diff --git a/share/common/msapi/extsys.py b/share/common/msapi/extsys.py index c0cc7f27..e1534523 100644 --- a/share/common/msapi/extsys.py +++ b/share/common/msapi/extsys.py @@ -70,6 +70,9 @@ def get_vim_by_id(vim_id): viminfo['tenant'] = tmp_authinfo.get('default-tenant') viminfo['cacert'] = tmp_authinfo.get('ssl-cacert') viminfo['insecure'] = tmp_authinfo.get('ssl-insecure') + viminfo["complex-name"] = tmp_viminfo.get("complex-name") + viminfo['openstack_region_id'] = tmp_viminfo.get("cloud-epa-caps") \ + if tmp_viminfo.get("cloud-epa-caps") else cloud_region_id return viminfo return None -- cgit 1.2.3-korg