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

diff --git a/genericparser/packages/biz/service_descriptor.py b/catalog/packages/biz/service_descriptor.py
similarity index 84%
rename from genericparser/packages/biz/service_descriptor.py
rename to catalog/packages/biz/service_descriptor.py
index b8cba6d..11b6fb3 100644
--- a/genericparser/packages/biz/service_descriptor.py
+++ b/catalog/packages/biz/service_descriptor.py
@@ -17,13 +17,12 @@ import logging
 import os
 import uuid
 
-
-from genericparser.packages.const import PKG_STATUS
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
-from genericparser.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
-from genericparser.pub.exceptions import GenericparserException, PackageNotFoundException
-from genericparser.pub.utils import toscaparsers, fileutil
-from genericparser.pub.utils.values import ignore_case_get
+from catalog.packages.const import PKG_STATUS
+from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
+from catalog.pub.exceptions import CatalogException, PackageNotFoundException
+from catalog.pub.utils import toscaparser, fileutil
+from catalog.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
 
@@ -62,7 +61,7 @@ class ServiceDescriptor(object):
         service_pkgs = ServicePackageModel.objects.filter(servicePackageId=serviced_info_id)
         service_pkgs.update(onboardingState=PKG_STATUS.PROCESSING)
 
-        serviced_json = toscaparsers.parse_sd(local_file_name)
+        serviced_json = toscaparser.parse_sd(local_file_name)
         serviced = json.JSONDecoder().decode(serviced_json)
 
         serviced_id = serviced.get("service", {}).get("properties", {}).get("descriptor_id", "")
@@ -71,11 +70,11 @@ class ServiceDescriptor(object):
         serviced_designer = serviced.get("service", {}).get("properties", {}).get("designer", "")
         invariant_id = serviced.get("service", {}).get("properties", {}).get("invariant_id", "")
         if serviced_id == "":
-            raise GenericparserException("serviced_id(%s) does not exist in metadata." % serviced_id)
+            raise CatalogException("serviced_id(%s) does not exist in metadata." % serviced_id)
         other_nspkg = ServicePackageModel.objects.filter(servicedId=serviced_id)
         if other_nspkg and other_nspkg[0].servicePackageId != serviced_info_id:
             logger.warn("ServiceD(%s,%s) already exists.", serviced_id, other_nspkg[0].servicePackageId)
-            raise GenericparserException("ServiceD(%s) already exists." % serviced_id)
+            raise CatalogException("ServiceD(%s) already exists." % serviced_id)
 
         for vnf in serviced["vnfs"]:
             vnfd_id = vnf["properties"].get("descriptor_id", "undefined")
@@ -87,7 +86,7 @@ class ServiceDescriptor(object):
             if not pkg:
                 vnfd_name = vnf.get("vnf_id", "undefined")
                 logger.error("[%s] is not distributed.", vnfd_name)
-                raise GenericparserException("VNF package(%s) is not distributed." % vnfd_id)
+                raise CatalogException("VNF package(%s) is not distributed." % vnfd_id)
 
         for pnf in serviced["pnfs"]:
             pnfd_id = pnf["properties"].get("descriptor_id", "undefined")
@@ -99,7 +98,7 @@ class ServiceDescriptor(object):
             if not pkg:
                 pnfd_name = pnf.get("pnf_id", "undefined")
                 logger.error("[%s] is not distributed.", pnfd_name)
-                raise GenericparserException("PNF package(%s) is not distributed." % pnfd_name)
+                raise CatalogException("PNF package(%s) is not distributed." % pnfd_name)
 
         service_pkgs.update(
             servicedId=serviced_id,
@@ -125,6 +124,6 @@ class ServiceDescriptor(object):
             logger.warn('ServiceD(%s) not found.' % serviced_info_id)
             raise PackageNotFoundException("Service package[%s] not Found." % serviced_info_id)
         service_pkgs.delete()
-        service_pkg_path = os.path.join(GENERICPARSER_ROOT_PATH, serviced_info_id)
+        service_pkg_path = os.path.join(CATALOG_ROOT_PATH, serviced_info_id)
         fileutil.delete_dirs(service_pkg_path)
         logger.info('ServiceD(%s) has been deleted.' % serviced_info_id)