Fix some bugs in vfc catalog

Change-Id: I44192b8979107c85cff98a83cc953e34862daddf
Issue-ID: VFC-364
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index cd36676..5bd121e 100644 (file)
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -25,6 +25,7 @@ from catalog.packages import ns_package
 
 logger = logging.getLogger(__name__)
 
+
 @api_view(http_method_names=['POST', 'GET'])
 def nspackages_rc(request, *args, **kwargs):
     logger.debug("Enter %s, method is %s", fun_name(), request.method)
@@ -45,6 +46,7 @@ def nspackages_rc(request, *args, **kwargs):
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)
 
+
 @api_view(http_method_names=['POST', 'GET'])
 def nfpackages_rc(request, *args, **kwargs):
     logger.debug("Enter %s%s, method is %s", fun_name(), request.data, request.method)
@@ -65,6 +67,7 @@ def nfpackages_rc(request, *args, **kwargs):
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)
 
+
 @api_view(http_method_names=['DELETE', 'GET'])
 def ns_rd_csar(request, *args, **kwargs):
     csar_id = ignore_case_get(kwargs, "csarId")
@@ -79,11 +82,12 @@ def ns_rd_csar(request, *args, **kwargs):
             csar_id = csar_id[:-5]
         ret = ns_package.ns_delete_csar(csar_id, force_delete)
         normal_status = status.HTTP_202_ACCEPTED
-    logger.info("Leave %s, Return value is %s", fun_name(), str(ret))
+    logger.info("Leave %s, Return value is %s", fun_name(), ret)
     if ret[0] != 0:
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)
 
+
 @api_view(http_method_names=['DELETE', 'GET'])
 def nf_rd_csar(request, *args, **kwargs):
     csar_id = ignore_case_get(kwargs, "csarId")
@@ -100,11 +104,12 @@ def nf_rd_csar(request, *args, **kwargs):
         nf_package.NfPkgDeleteThread(csar_id, job_id, force_delete).start()
         ret = [0, {"jobId": job_id}]
         normal_status = status.HTTP_202_ACCEPTED
-    logger.info("Leave %s, Return value is %s", fun_name(), str(ret))
+    logger.info("Leave %s, Return value is %s", fun_name(), ret)
     if ret[0] != 0:
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)
 
+
 @api_view(http_method_names=['POST'])
 def ns_model_parser(request, *args, **kwargs):
     csar_id = ignore_case_get(request.data, "csarId")
@@ -112,12 +117,16 @@ def ns_model_parser(request, *args, **kwargs):
     if request.method == 'POST':
         ret = ns_package.parser_nsdmodel(csar_id,inputs)
         normal_status = status.HTTP_202_ACCEPTED
+    else:
+        ret = [1, "Request is not allowed"]
+        normal_status = ""
 
-    logger.info("Leave %s, Return value is %s", fun_name(), str(ret))
+    logger.info("Leave %s, Return value is %s", fun_name(), ret)
     if ret[0] != 0:
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)
 
+
 @api_view(http_method_names=['POST'])
 def vnf_model_parser(request, *args, **kwargs):
     csar_id = ignore_case_get(request.data, "csarId")
@@ -125,8 +134,11 @@ def vnf_model_parser(request, *args, **kwargs):
     if request.method == 'POST':
         ret = nf_package.parser_vnfdmodel(csar_id,inputs)
         normal_status = status.HTTP_202_ACCEPTED
+    else:
+        ret = [1, "Request is not allowed"]
+        normal_status = ""
 
-    logger.info("Leave %s, Return value is %s", fun_name(), str(ret))
+    logger.info("Leave %s, Return value is %s", fun_name(), ret)
     if ret[0] != 0:
         return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
     return Response(data=ret[1], status=normal_status)

diff --git a/catalog/pub/exceptions.py b/catalog/pub/exceptions.py
index d23cfdc..c994b46 100644 (file)
--- a/catalog/pub/exceptions.py
+++ b/catalog/pub/exceptions.py
@@ -15,6 +15,3 @@
 
 class CatalogException(Exception):
     pass
-
-class NSLCMException(Exception):
-    pass

diff --git a/catalog/pub/msapi/extsys.py b/catalog/pub/msapi/extsys.py
index bb8c813..4a0d4f8 100644 (file)
--- a/catalog/pub/msapi/extsys.py
+++ b/catalog/pub/msapi/extsys.py
@@ -17,7 +17,7 @@ import logging
 import uuid
 
 from catalog.pub.config.config import AAI_BASE_URL, AAI_USER, AAI_PASSWD
-from catalog.pub.exceptions import NSLCMException
+from catalog.pub.exceptions import CatalogException
 from catalog.pub.utils import restcall
 from catalog.pub.utils.values import ignore_case_get
 
@@ -44,7 +44,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 NSLCMException("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")
@@ -90,7 +90,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 NSLCMException("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)
@@ -102,7 +102,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 NSLCMException("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)
@@ -133,7 +133,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 NSLCMException('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)
@@ -164,7 +164,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 NSLCMException('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:
@@ -175,4 +175,4 @@ def select_vnfm(vnfm_type, vim_id):
             # convert vnfm_info_aai to internal vnfm_info
             vnfm = convert_vnfm_info(vnfm)
             return vnfm
-    raise NSLCMException('No vnfm found with %s in vim(%s)' % (vnfm_type, vim_id))
\ No newline at end of file
+    raise CatalogException('No vnfm found with %s in vim(%s)' % (vnfm_type, vim_id))