update for change to etsicatalog

[modeling/etsicatalog.git] / catalog / packages / biz / pnf_descriptor.py

diff --git a/genericparser/packages/biz/pnf_descriptor.py b/catalog/packages/biz/pnf_descriptor.py
similarity index 84%
rename from genericparser/packages/biz/pnf_descriptor.py
rename to catalog/packages/biz/pnf_descriptor.py
index 561c8fa..547c198 100644 (file)
--- a/genericparser/packages/biz/pnf_descriptor.py
+++ b/catalog/packages/biz/pnf_descriptor.py
@@ -18,13 +18,13 @@ import logging
 import os
 import uuid
 
-from genericparser.packages.biz.common import 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
-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 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
+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__)
 
@@ -77,7 +77,7 @@ class PnfDescriptor(object):
         pnf_pkgs = PnfPackageModel.objects.filter(pnfPackageId=pnfd_info_id)
         if not pnf_pkgs.exists():
             logger.info('PNFD(%s) does not exist.' % pnfd_info_id)
-            raise GenericparserException('PNFD (%s) does not exist.' % pnfd_info_id)
+            raise CatalogException('PNFD (%s) does not exist.' % pnfd_info_id)
         pnf_pkgs.update(onboardingState=PKG_STATUS.UPLOADING)
 
         local_file_name = save(remote_file, pnfd_info_id)
@@ -93,7 +93,7 @@ class PnfDescriptor(object):
         '''
         if pnf_pkgs[0].usageState != PKG_STATUS.NOT_IN_USE:
             logger.info('PNFD(%s) shall be NOT_IN_USE.' % pnfd_info_id)
-            raise GenericparserException('PNFD(%s) shall be NOT_IN_USE.' % pnfd_info_id)
+            raise CatalogException('PNFD(%s) shall be NOT_IN_USE.' % pnfd_info_id)
         '''
         del_pnfd_id = pnf_pkgs[0].pnfdId
         ns_pkgs = NSPackageModel.objects.all()
@@ -106,9 +106,9 @@ class PnfDescriptor(object):
             for pnf in nsd_model['pnfs']:
                 if del_pnfd_id == pnf["properties"]["id"]:
                     logger.warn("PNFD(%s) is referenced in NSD", del_pnfd_id)
-                    raise GenericparserException('PNFD(%s) is referenced.' % pnfd_info_id)
+                    raise CatalogException('PNFD(%s) is referenced.' % pnfd_info_id)
         pnf_pkgs.delete()
-        pnf_pkg_path = os.path.join(GENERICPARSER_ROOT_PATH, pnfd_info_id)
+        pnf_pkg_path = os.path.join(CATALOG_ROOT_PATH, pnfd_info_id)
         fileutil.delete_dirs(pnf_pkg_path)
         logger.debug('PNFD(%s) has been deleted.' % pnfd_info_id)
 
@@ -120,7 +120,7 @@ class PnfDescriptor(object):
             raise ResourceNotFoundException('PNFD(%s) does not exist.' % pnfd_info_id)
         if pnf_pkgs[0].onboardingState != PKG_STATUS.ONBOARDED:
             logger.error('PNFD(%s) is not ONBOARDED.' % pnfd_info_id)
-            raise GenericparserException('PNFD(%s) is not ONBOARDED.' % pnfd_info_id)
+            raise CatalogException('PNFD(%s) is not ONBOARDED.' % pnfd_info_id)
 
         local_file_path = pnf_pkgs[0].localFilePath
         start, end = 0, os.path.getsize(local_file_path)
@@ -131,7 +131,7 @@ class PnfDescriptor(object):
         logger.info('Start to process PNFD(%s)...' % pnfd_info_id)
         pnf_pkgs = PnfPackageModel.objects.filter(pnfPackageId=pnfd_info_id)
         pnf_pkgs.update(onboardingState=PKG_STATUS.PROCESSING)
-        pnfd_json = toscaparsers.parse_pnfd(local_file_name)
+        pnfd_json = toscaparser.parse_pnfd(local_file_name)
         pnfd = json.JSONDecoder().decode(pnfd_json)
 
         logger.debug("pnfd_json is %s" % pnfd_json)
@@ -152,7 +152,7 @@ class PnfDescriptor(object):
             if pnfd_id == "":
                 pnfd_id = pnfd["metadata"].get("UUID", "")
             if pnfd_id == "":
-                raise GenericparserException('pnfd_id is Null.')
+                raise CatalogException('pnfd_id is Null.')
 
         if pnfdVersion == "":
             pnfdVersion = pnfd["metadata"].get("template_version", "")
@@ -169,11 +169,10 @@ class PnfDescriptor(object):
             if pnfdVersion == "":
                 pnfdName = pnfd["metadata"].get("name", "")
 
-        if pnfd_id:
-            other_pnf = PnfPackageModel.objects.filter(pnfdId=pnfd_id)
-            if other_pnf and other_pnf[0].pnfPackageId != pnfd_info_id:
-                logger.info('PNFD(%s) already exists.' % pnfd_id)
-                raise GenericparserException("PNFD(%s) already exists." % pnfd_id)
+        other_pnf = PnfPackageModel.objects.filter(pnfdId=pnfd_id)
+        if other_pnf and other_pnf[0].pnfPackageId != pnfd_info_id:
+            logger.info('PNFD(%s) already exists.' % pnfd_id)
+            raise CatalogException("PNFD(%s) already exists." % pnfd_id)
 
         pnf_pkgs.update(
             pnfdId=pnfd_id,
@@ -213,14 +212,13 @@ class PnfDescriptor(object):
         pnf_pkg.update(onboardingState=PKG_STATUS.CREATED)
 
     def parse_pnfd(self, csar_id, inputs):
-
         try:
             pnf_pkg = PnfPackageModel.objects.filter(pnfPackageId=csar_id)
             if not pnf_pkg:
-                raise GenericparserException("PNF CSAR(%s) does not exist." % csar_id)
+                raise CatalogException("PNF CSAR(%s) does not exist." % csar_id)
             csar_path = pnf_pkg[0].localFilePath
-            ret = {"model": toscaparsers.parse_pnfd(csar_path, inputs)}
-        except GenericparserException as e:
+            ret = {"model": toscaparser.parse_pnfd(csar_path, inputs)}
+        except CatalogException as e:
             return [1, e.args[0]]
         except Exception as e:
             logger.error(e.args[0])