X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpub%2Fmsapi%2Fextsys.py;fp=genericparser%2Fpub%2Fmsapi%2Fextsys.py;h=e038f2618a711c9ccfa1aa265822288e8e454c46;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=639513fb8cb9a1ce3a9377eb88fea0370a5b34ab;hpb=431a5a35a8e0a26d21c663167303696db8a7a2a6;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/pub/msapi/extsys.py b/catalog/pub/msapi/extsys.py
similarity index 88%
rename from genericparser/pub/msapi/extsys.py
rename to catalog/pub/msapi/extsys.py
index 639513f..e038f26 100644
--- a/genericparser/pub/msapi/extsys.py
+++ b/catalog/pub/msapi/extsys.py
@@ -16,17 +16,17 @@ import json
 import logging
 import uuid
 
-from genericparser.pub.config.config import AAI_BASE_URL, AAI_USER, AAI_PASSWD
-from genericparser.pub.exceptions import GenericparserException
-from genericparser.pub.utils import restcall
-from genericparser.pub.utils.values import ignore_case_get
+from catalog.pub.config.config import AAI_BASE_URL, AAI_USER, AAI_PASSWD
+from catalog.pub.exceptions import CatalogException
+from catalog.pub.utils import restcall
+from catalog.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
 
 
 def call_aai(resource, method, content=''):
     additional_headers = {
-        'X-FromAppId': 'MODEL-GENERICPARSER',
+        'X-FromAppId': 'VFC-CATALOG',
         'X-TransactionId': str(uuid.uuid1())
     }
     return restcall.call_req(AAI_BASE_URL,
@@ -43,7 +43,7 @@ def get_vims():
     ret = call_aai("/cloud-infrastructure/cloud-regions?depth=all", "GET")
     if ret[0] != 0:
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise GenericparserException("Failed to query vims from extsys.")
+        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")
@@ -60,7 +60,7 @@ def get_vim_by_id(vim_id):
                    % (cloud_owner, cloud_region), "GET")
     if ret[0] != 0:
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise GenericparserException("Failed to query vim(%s) from extsys." % vim_id)
+        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)
@@ -99,7 +99,7 @@ def get_sdn_controller_by_id(sdn_ontroller_id):
                    % sdn_ontroller_id, "GET")
     if ret[0] != 0:
         logger.error("Failed to query sdn ontroller(%s) from extsys. detail is %s.", sdn_ontroller_id, ret[1])
-        raise GenericparserException("Failed to query sdn ontroller(%s) from extsys." % sdn_ontroller_id)
+        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 +130,7 @@ def get_vnfm_by_id(vnfm_inst_id):
     ret = call_aai(uri, "GET")
     if ret[0] > 0:
         logger.error('Send get VNFM information request to extsys failed.')
-        raise GenericparserException('Send get VNFM information request to extsys failed.')
+        raise CatalogException('Send get VNFM information request to extsys failed.')
     # convert vnfm_info_aai to internal vnfm_info
     vnfm_info_aai = json.JSONDecoder().decode(ret[1])
     vnfm_info = convert_vnfm_info(vnfm_info_aai)
@@ -161,7 +161,7 @@ def select_vnfm(vnfm_type, vim_id):
     ret = call_aai(uri, "GET")
     if ret[0] > 0:
         logger.error("Failed to call %s: %s", uri, ret[1])
-        raise GenericparserException('Failed to get vnfms from extsys.')
+        raise CatalogException('Failed to get vnfms from extsys.')
     vnfms = json.JSONDecoder().decode(ret[1])
     vnfms = ignore_case_get(vnfms, "esr-vnfm")
     for vnfm in vnfms:
@@ -172,4 +172,4 @@ def select_vnfm(vnfm_type, vim_id):
             # convert vnfm_info_aai to internal vnfm_info
             vnfm = convert_vnfm_info(vnfm)
             return vnfm
-    raise GenericparserException('No vnfm found with %s in vim(%s)' % (vnfm_type, vim_id))
+    raise CatalogException('No vnfm found with %s in vim(%s)' % (vnfm_type, vim_id))