diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-09-08 13:43:00 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2017-09-08 13:43:00 +0800 |
| commit | 08fd690840bea327695aca0e816345c5ce7e3cbf (patch) | |
| tree | 5e391f89518680bcd610f101d1d1a2154c58494d /newton/newton/pub | |
| parent | 56ce57f8a325eab4786d1b4b7d10570a9698faca (diff) | |
Populate EPA Capabilities info into AAI
parse and discover EPA CAPs and populate them into AAI
fix API call to query ESR
Change-Id: I8b5e0429d3fbc9e17390b9c4df9cd12c1f0a42b4
Issue-Id: MULTICLOUD-58
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton/newton/pub')
| -rw-r--r-- | newton/newton/pub/msapi/extsys.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/newton/newton/pub/msapi/extsys.py b/newton/newton/pub/msapi/extsys.py index 57beb0e9..76066991 100644 --- a/newton/newton/pub/msapi/extsys.py +++ b/newton/newton/pub/msapi/extsys.py @@ -37,7 +37,8 @@ def get_vim_by_id(vim_id): #assume esr-system-info-id is composed by {cloud-owner} _ {cloud-region-id} retcode2,content2,status_code2 = \ - req_to_aai("/cloud-infrastructure/esr-system-info/%s/%s/%s_%s" \ + req_to_aai("/cloud-infrastructure/cloud-regions/cloud-region/%s/%s" + + "/esr-system-info-list/esr-system-info/%s_%s" \ % (cloud_owner,cloud_region_id,cloud_owner,cloud_region_id), "GET") if retcode2 != 0: @@ -64,7 +65,7 @@ def get_vim_by_id(vim_id): viminfo['userName'] = tmp_authinfo['user-name'] viminfo['password'] = tmp_authinfo['password'] viminfo['domain'] = tmp_authinfo['cloud-domain'] - viminfo['url'] = tmp_authinfo['url'] + viminfo['url'] = tmp_authinfo['service-url'] viminfo['tenant'] = tmp_authinfo['default-tenant'] viminfo['cacert'] = tmp_authinfo['ssl-cacert'] viminfo['insecure'] = tmp_authinfo['ssl-insecure'] |