diff options
Diffstat (limited to 'catalog/pub/msapi/extsys.py')
| -rw-r--r-- | catalog/pub/msapi/extsys.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/catalog/pub/msapi/extsys.py b/catalog/pub/msapi/extsys.py index ad300fe4..e038f261 100644 --- a/catalog/pub/msapi/extsys.py +++ b/catalog/pub/msapi/extsys.py @@ -29,7 +29,6 @@ def call_aai(resource, method, content=''): 'X-FromAppId': 'VFC-CATALOG', 'X-TransactionId': str(uuid.uuid1()) } - return restcall.call_req(AAI_BASE_URL, AAI_USER, AAI_PASSWD, @@ -45,7 +44,6 @@ def get_vims(): if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise CatalogException("Failed to query vims from extsys.") - # convert vim_info_aai to internal vim_info vims_aai = json.JSONDecoder().decode(ret[1]) vims_aai = ignore_case_get(vims_aai, "cloud-region") @@ -63,7 +61,6 @@ def get_vim_by_id(vim_id): if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise CatalogException("Failed to query vim(%s) from extsys." % vim_id) - # convert vim_info_aai to internal vim_info vim_info_aai = json.JSONDecoder().decode(ret[1]) vim_info = convert_vim_info(vim_info_aai) @@ -103,7 +100,6 @@ def get_sdn_controller_by_id(sdn_ontroller_id): if ret[0] != 0: logger.error("Failed to query sdn ontroller(%s) from extsys. detail is %s.", sdn_ontroller_id, ret[1]) raise CatalogException("Failed to query sdn ontroller(%s) from extsys." % sdn_ontroller_id) - # convert vim_info_aai to internal vim_info sdnc_info_aai = json.JSONDecoder().decode(ret[1]) sdnc_info = convert_sdnc_info(sdnc_info_aai) @@ -130,7 +126,7 @@ def convert_sdnc_info(sdnc_info_aai): def get_vnfm_by_id(vnfm_inst_id): - uri = '/external-system/esr-vnfm-list/esr-vnfm/%s?depth=all' % vnfm_inst_id + uri = "/external-system/esr-vnfm-list/esr-vnfm/%s?depth=all" % vnfm_inst_id ret = call_aai(uri, "GET") if ret[0] > 0: logger.error('Send get VNFM information request to extsys failed.') @@ -161,7 +157,7 @@ def convert_vnfm_info(vnfm_info_aai): def select_vnfm(vnfm_type, vim_id): - uri = '/external-system/esr-vnfm-list?depth=all' + uri = "/external-system/esr-vnfm-list?depth=all" ret = call_aai(uri, "GET") if ret[0] > 0: logger.error("Failed to call %s: %s", uri, ret[1]) |