X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fns_descriptor.py;fp=genericparser%2Fpackages%2Fbiz%2Fns_descriptor.py;h=f0e05723e108a9b4b55b3aed45ff77eefa42f9b6;hb=5fd2ae6a4517980ce0f89247bb354220748ae67b;hp=60d4a26b702ec11b5481a77d9a2ec48c5d6b9350;hpb=842a4fd77b1c9f93a4b97bd7f138c9b35a855d13;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
similarity index 87%
rename from genericparser/packages/biz/ns_descriptor.py
rename to catalog/packages/biz/ns_descriptor.py
index 60d4a26..f0e0572 100644
--- a/genericparser/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -18,13 +18,13 @@ import logging
 import os
 import uuid
 
-from genericparser.packages.biz.common import parse_file_range, read, save
-from genericparser.packages.const import PKG_STATUS
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
-from genericparser.pub.database.models import NSPackageModel, PnfPackageModel, VnfPackageModel
-from genericparser.pub.exceptions import GenericparserException, ResourceNotFoundException
-from genericparser.pub.utils import fileutil, toscaparsers
-from genericparser.pub.utils.values import ignore_case_get
+from catalog.packages.biz.common import parse_file_range, read, save
+from catalog.packages.const import PKG_STATUS
+from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.database.models import NSPackageModel, PnfPackageModel, VnfPackageModel
+from catalog.pub.exceptions import CatalogException, ResourceNotFoundException
+from catalog.pub.utils import fileutil, toscaparser
+from catalog.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
 
@@ -84,13 +84,13 @@ class NsDescriptor(object):
         '''
         if ns_pkgs[0].operationalState != PKG_STATUS.DISABLED:
             logger.error('NSD(%s) shall be DISABLED.' % nsd_info_id)
-            raise GenericparserException('NSD(%s) shall be DISABLED.' % nsd_info_id)
+            raise CatalogException('NSD(%s) shall be DISABLED.' % nsd_info_id)
         if ns_pkgs[0].usageState != PKG_STATUS.NOT_IN_USE:
             logger.error('NSD(%s) shall be NOT_IN_USE.' % nsd_info_id)
-            raise GenericparserException('NSD(%s) shall be NOT_IN_USE.' % nsd_info_id)
+            raise CatalogException('NSD(%s) shall be NOT_IN_USE.' % nsd_info_id)
         '''
         ns_pkgs.delete()
-        ns_pkg_path = os.path.join(GENERICPARSER_ROOT_PATH, nsd_info_id)
+        ns_pkg_path = os.path.join(CATALOG_ROOT_PATH, nsd_info_id)
         fileutil.delete_dirs(ns_pkg_path)
         logger.info('NSD(%s) has been deleted.' % nsd_info_id)
 
@@ -99,7 +99,7 @@ class NsDescriptor(object):
         ns_pkgs = NSPackageModel.objects.filter(nsPackageId=nsd_info_id)
         if not ns_pkgs.exists():
             logger.error('NSD(%s) does not exist.' % nsd_info_id)
-            raise GenericparserException('NSD(%s) does not exist.' % nsd_info_id)
+            raise CatalogException('NSD(%s) does not exist.' % nsd_info_id)
         ns_pkgs.update(onboardingState=PKG_STATUS.UPLOADING)
 
         local_file_name = save(remote_file, nsd_info_id)
@@ -114,7 +114,7 @@ class NsDescriptor(object):
             raise ResourceNotFoundException('NSD(%s) does not exist.' % nsd_info_id)
         if ns_pkgs[0].onboardingState != PKG_STATUS.ONBOARDED:
             logger.error('NSD(%s) is not ONBOARDED.' % nsd_info_id)
-            raise GenericparserException('NSD(%s) is not ONBOARDED.' % nsd_info_id)
+            raise CatalogException('NSD(%s) is not ONBOARDED.' % nsd_info_id)
 
         local_file_path = ns_pkgs[0].localFilePath
         start, end = parse_file_range(local_file_path, file_range)
@@ -126,7 +126,7 @@ class NsDescriptor(object):
         ns_pkgs = NSPackageModel.objects.filter(nsPackageId=nsd_info_id)
         ns_pkgs.update(onboardingState=PKG_STATUS.PROCESSING)
 
-        nsd_json = toscaparsers.parse_nsd(local_file_name)
+        nsd_json = toscaparser.parse_nsd(local_file_name)
         logger.debug("%s", nsd_json)
         nsd = json.JSONDecoder().decode(nsd_json)
 
@@ -136,11 +136,11 @@ class NsDescriptor(object):
         nsd_designer = nsd.get("ns", {}).get("properties", {}).get("designer", "")
         invariant_id = nsd.get("ns", {}).get("properties", {}).get("invariant_id", "")
         if nsd_id == "":
-            raise GenericparserException("nsd_id(%s) does not exist in metadata." % nsd_id)
+            raise CatalogException("nsd_id(%s) does not exist in metadata." % nsd_id)
         other_nspkg = NSPackageModel.objects.filter(nsdId=nsd_id)
         if other_nspkg and other_nspkg[0].nsPackageId != nsd_info_id:
             logger.warn("NSD(%s,%s) already exists.", nsd_id, other_nspkg[0].nsPackageId)
-            raise GenericparserException("NSD(%s) already exists." % nsd_id)
+            raise CatalogException("NSD(%s) already exists." % nsd_id)
 
         for vnf in nsd["vnfs"]:
             vnfd_id = vnf["properties"].get("descriptor_id", "undefined")
@@ -152,7 +152,7 @@ class NsDescriptor(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 nsd["pnfs"]:
             pnfd_id = pnf["properties"].get("descriptor_id", "undefined")
@@ -164,7 +164,7 @@ class NsDescriptor(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)
 
         ns_pkgs.update(
             nsdId=nsd_id,