X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fsdc_ns_package.py;fp=genericparser%2Fpackages%2Fbiz%2Fsdc_ns_package.py;h=4f9d4600ea5c09d2d30a4d52c3de88412edef686;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=63a077f206bec97b6b139f6c241f88d0eb3f4d47;hpb=431a5a35a8e0a26d21c663167303696db8a7a2a6;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/biz/sdc_ns_package.py b/catalog/packages/biz/sdc_ns_package.py
similarity index 82%
rename from genericparser/packages/biz/sdc_ns_package.py
rename to catalog/packages/biz/sdc_ns_package.py
index 63a077f..4f9d460 100644
--- a/genericparser/packages/biz/sdc_ns_package.py
+++ b/catalog/packages/biz/sdc_ns_package.py
@@ -17,14 +17,14 @@ import os
 import sys
 import traceback
 
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH, GENERICPARSER_URL_PATH
-from genericparser.pub.config.config import REG_TO_MSB_REG_PARAM
-from genericparser.pub.database.models import NSPackageModel
-from genericparser.pub.exceptions import GenericparserException
-from genericparser.pub.msapi import sdc
-from genericparser.pub.utils import toscaparsers
-from genericparser.packages.biz.ns_descriptor import NsDescriptor
-from genericparser.pub.utils import fileutil
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
+from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
+from catalog.pub.database.models import NSPackageModel
+from catalog.pub.exceptions import CatalogException
+from catalog.pub.msapi import sdc
+from catalog.pub.utils import toscaparser
+from catalog.packages.biz.ns_descriptor import NsDescriptor
+from catalog.pub.utils import fileutil
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ def ns_on_distribute(csar_id):
     ret = None
     try:
         ret = NsPackage().on_distribute(csar_id)
-    except GenericparserException as e:
+    except CatalogException as e:
         NsPackage().delete_csar(csar_id)
         return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0])
     except:
@@ -57,7 +57,7 @@ def ns_delete_csar(csar_id):
     ret = None
     try:
         ret = NsPackage().delete_csar(csar_id)
-    except GenericparserException as e:
+    except CatalogException as e:
         return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0])
     except:
         logger.error(traceback.format_exc())
@@ -69,7 +69,7 @@ def ns_get_csars():
     ret = None
     try:
         ret = NsPackage().get_csars()
-    except GenericparserException as e:
+    except CatalogException as e:
         return [1, e.args[0]]
     except:
         logger.error(traceback.format_exc())
@@ -81,7 +81,7 @@ def ns_get_csar(csar_id):
     ret = None
     try:
         ret = NsPackage().get_csar(csar_id)
-    except GenericparserException as e:
+    except CatalogException as e:
         return [1, e.args[0]]
     except Exception as e:
         logger.error(e.args[0])
@@ -95,10 +95,10 @@ def parse_nsd(csar_id, inputs):
     try:
         ns_pkg = NSPackageModel.objects.filter(nsPackageId=csar_id)
         if not ns_pkg:
-            raise GenericparserException("NS CSAR(%s) does not exist." % csar_id)
+            raise CatalogException("NS CSAR(%s) does not exist." % csar_id)
         csar_path = ns_pkg[0].localFilePath
-        ret = {"model": toscaparsers.parse_nsd(csar_path, inputs)}
-    except GenericparserException as e:
+        ret = {"model": toscaparser.parse_nsd(csar_path, inputs)}
+    except CatalogException as e:
         return [1, e.args[0]]
     except Exception as e:
         logger.error(e.args[0])
@@ -120,7 +120,7 @@ class NsPackage(object):
             return [1, "NS CSAR(%s) already exists." % csar_id]
 
         artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id)
-        local_path = os.path.join(GENERICPARSER_ROOT_PATH, csar_id)
+        local_path = os.path.join(CATALOG_ROOT_PATH, csar_id)
         csar_name = "%s.csar" % artifact.get("name", csar_id)
         local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], local_path, csar_name)
         if local_file_name.endswith(".csar") or local_file_name.endswith(".zip"):
@@ -163,10 +163,10 @@ class NsPackage(object):
             package_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["ip"],
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
-                GENERICPARSER_URL_PATH,
+                CATALOG_URL_PATH,
                 csar_id,
                 csars[0].nsPackageUri)
         else:
-            raise GenericparserException("Ns package[%s] not Found." % csar_id)
+            raise CatalogException("Ns package[%s] not Found." % csar_id)
 
         return [0, {"csarId": csar_id, "packageInfo": package_info}]