summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxinhuili <lxinhui@vmware.com>2017-09-19 10:23:51 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-19 10:23:51 +0000
commitcf5946dab8e95bb0ba3a4a65da36bb0ac0686ab2 (patch)
treefa4cd978f9b7131d9d79abb20d01f41befc9ae74
parent29c5cb22d31cb433f1f7d488814a609aeeb9a153 (diff)
parentc9aa53d5912f1d45863a93dfbba0b6d1c80106ff (diff)
Merge "Add more VIM info from AAI"
-rw-r--r--vio/vio/pub/msapi/extsys.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/vio/vio/pub/msapi/extsys.py b/vio/vio/pub/msapi/extsys.py
index 5584a3f..b3ed044 100644
--- a/vio/vio/pub/msapi/extsys.py
+++ b/vio/vio/pub/msapi/extsys.py
@@ -31,6 +31,7 @@ def get_vim_by_id(vim_id):
ret['type'] = ret['cloud-type']
ret['version'] = ret['cloud-region-version']
ret['vimId'] = vim_id
+ ret['name'] = vim_id
ret['userName'] = ret['esr-system-info-list'][
'esr-system-info'][0]['username']
ret['password'] = ret['esr-system-info-list'][
@@ -39,4 +40,10 @@ def get_vim_by_id(vim_id):
'esr-system-info'][0]['default-tenant']
ret['url'] = ret['esr-system-info-list'][
'esr-system-info'][0]['service-url']
+ ret['domain'] = ret['esr-system-info-list'][
+ 'esr-system-info'][0]['cloud-domain']
+ ret['cacert'] = ret['esr-system-info-list'][
+ 'esr-system-info'][0]['ssl-cacert']
+ ret['insecure'] = ret['esr-system-info-list'][
+ 'esr-system-info'][0]['ssl-insecure']
return ret