diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-11-09 20:58:51 +0800 |
|---|---|---|
| committer |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-11-09 13:41:32 +0000 |
| commit | 7856284bf4792e769a3d766b188f843f17d285ae (patch) | |
| tree | 995f855f6ec4965defd6ea6c2ec85513088176af /lcm/pub/msapi/extsys.py | |
| parent | 3a865cbd2f5dd1d9ca9e4715faf42c16ca65545d (diff) | |
Fix vfc-lcm vserver report bug.
Change-Id: I95b4afa2482c9ab145dcd5cfc266145f40b97851
Issue-ID: VFC-589
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'lcm/pub/msapi/extsys.py')
| -rw-r--r-- | lcm/pub/msapi/extsys.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lcm/pub/msapi/extsys.py b/lcm/pub/msapi/extsys.py index 51673d31..d01a5b8b 100644 --- a/lcm/pub/msapi/extsys.py +++ b/lcm/pub/msapi/extsys.py @@ -61,6 +61,13 @@ def convert_vim_info(vim_info_aai): vim_id = vim_info_aai["cloud-owner"] + "_" + vim_info_aai["cloud-region-id"] esr_system_info = ignore_case_get(ignore_case_get(vim_info_aai, "esr-system-info-list"), "esr-system-info") # tenants = ignore_case_get(vim_info_aai, "tenants") + default_tenant = ignore_case_get(esr_system_info[0], "default-tenant") + tenants = ignore_case_get(ignore_case_get(vim_info_aai, "tenants"), "tenant") + tenant_id = "" + for tenant_info in tenants: + if tenant_info["tenant-name"] == default_tenant: + tenant_id = tenant_info["tenant-id"] + break vim_info = { "vimId": vim_id, "name": vim_id, @@ -68,7 +75,8 @@ def convert_vim_info(vim_info_aai): "userName": ignore_case_get(esr_system_info[0], "user-name"), "password": ignore_case_get(esr_system_info[0], "password"), # "tenant": ignore_case_get(tenants[0], "tenant-id"), - "tenant": ignore_case_get(esr_system_info[0], "default-tenant"), + "tenantId": tenant_id, + "tenant": default_tenant, "vendor": ignore_case_get(esr_system_info[0], "vendor"), "version": ignore_case_get(esr_system_info[0], "version"), "description": "vim", |