update for change to etsicatalog

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

diff --git a/genericparser/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py
similarity index 84%
rename from genericparser/packages/biz/vnf_package.py
rename to catalog/packages/biz/vnf_package.py
index cf67a76..585a599 100644 (file)
--- a/genericparser/packages/biz/vnf_package.py
+++ b/catalog/packages/biz/vnf_package.py
@@ -21,13 +21,13 @@ import traceback
 import urllib
 import uuid
 
-from genericparser.packages.biz.common import parse_file_range, read, save
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
-from genericparser.pub.database.models import VnfPackageModel, NSPackageModel
-from genericparser.pub.exceptions import GenericparserException, ResourceNotFoundException
-from genericparser.pub.utils.values import ignore_case_get
-from genericparser.pub.utils import fileutil, toscaparsers
-from genericparser.packages.const import PKG_STATUS
+from catalog.packages.biz.common import parse_file_range, read, save
+from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.database.models import VnfPackageModel, NSPackageModel
+from catalog.pub.exceptions import CatalogException, ResourceNotFoundException
+from catalog.pub.utils.values import ignore_case_get
+from catalog.pub.utils import fileutil, toscaparser
+from catalog.packages.const import PKG_STATUS
 
 
 logger = logging.getLogger(__name__)
@@ -80,9 +80,9 @@ class VnfPackage(object):
             return
         '''
         if vnf_pkg[0].operationalState != PKG_STATUS.DISABLED:
-            raise GenericparserException("The VNF package (%s) is not disabled" % vnf_pkg_id)
+            raise CatalogException("The VNF package (%s) is not disabled" % vnf_pkg_id)
         if vnf_pkg[0].usageState != PKG_STATUS.NOT_IN_USE:
-            raise GenericparserException("The VNF package (%s) is in use" % vnf_pkg_id)
+            raise CatalogException("The VNF package (%s) is in use" % vnf_pkg_id)
         '''
         del_vnfd_id = vnf_pkg[0].vnfdId
         ns_pkgs = NSPackageModel.objects.all()
@@ -94,9 +94,9 @@ class VnfPackage(object):
                 continue
             for vnf in nsd_model['vnfs']:
                 if del_vnfd_id == vnf["properties"]["descriptor_id"]:
-                    raise GenericparserException('VNFD(%s) is referenced.' % del_vnfd_id)
+                    raise CatalogException('VNFD(%s) is referenced.' % del_vnfd_id)
         vnf_pkg.delete()
-        vnf_pkg_path = os.path.join(GENERICPARSER_ROOT_PATH, vnf_pkg_id)
+        vnf_pkg_path = os.path.join(CATALOG_ROOT_PATH, vnf_pkg_id)
         fileutil.delete_dirs(vnf_pkg_path)
         logger.info('VNF package(%s) has been deleted.' % vnf_pkg_id)
 
@@ -105,7 +105,7 @@ class VnfPackage(object):
         vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnf_pkg_id)
         # if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED:
         #     logger.error("VNF package(%s) is not CREATED" % vnf_pkg_id)
-        #     raise GenericparserException("VNF package(%s) is not CREATED" % vnf_pkg_id)
+        #     raise CatalogException("VNF package(%s) is not CREATED" % vnf_pkg_id)
         vnf_pkg.update(onboardingState=PKG_STATUS.UPLOADING)
 
         local_file_name = save(remote_file, vnf_pkg_id)
@@ -119,7 +119,7 @@ class VnfPackage(object):
             logger.error('VNF package(%s) does not exist.' % vnf_pkg_id)
             raise ResourceNotFoundException('VNF package(%s) does not exist.' % vnf_pkg_id)
         if nf_pkg[0].onboardingState != PKG_STATUS.ONBOARDED:
-            raise GenericparserException("VNF package (%s) is not on-boarded" % vnf_pkg_id)
+            raise CatalogException("VNF package (%s) is not on-boarded" % vnf_pkg_id)
 
         local_file_path = nf_pkg[0].localFilePath
         start, end = parse_file_range(local_file_path, file_range)
@@ -138,7 +138,7 @@ class VnfPkgUploadThread(threading.Thread):
         try:
             self.upload_vnf_pkg_from_uri()
             parse_vnfd_and_save(self.vnf_pkg_id, self.upload_file_name)
-        except GenericparserException as e:
+        except CatalogException as e:
             logger.error(e.args[0])
         except Exception as e:
             logger.error(e.args[0])
@@ -150,13 +150,13 @@ class VnfPkgUploadThread(threading.Thread):
         vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=self.vnf_pkg_id)
         if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED:
             logger.error("VNF package(%s) is not CREATED" % self.vnf_pkg_id)
-            raise GenericparserException("VNF package (%s) is not created" % self.vnf_pkg_id)
+            raise CatalogException("VNF package (%s) is not created" % self.vnf_pkg_id)
         vnf_pkg.update(onboardingState=PKG_STATUS.UPLOADING)
 
         uri = ignore_case_get(self.data, "addressInformation")
         response = urllib.request.urlopen(uri)
 
-        local_file_dir = os.path.join(GENERICPARSER_ROOT_PATH, self.vnf_pkg_id)
+        local_file_dir = os.path.join(CATALOG_ROOT_PATH, self.vnf_pkg_id)
         self.upload_file_name = os.path.join(local_file_dir, os.path.basename(uri))
         if not os.path.exists(local_file_dir):
             fileutil.make_dirs(local_file_dir)
@@ -190,7 +190,7 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path):
     logger.info('Start to process VNF package(%s)...' % vnf_pkg_id)
     vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnf_pkg_id)
     vnf_pkg.update(onboardingState=PKG_STATUS.PROCESSING)
-    vnfd_json = toscaparsers.parse_vnfd(vnf_pkg_path)
+    vnfd_json = toscaparser.parse_vnfd(vnf_pkg_path)
     vnfd = json.JSONDecoder().decode(vnfd_json)
 
     if vnfd.get("vnf", "") != "":
@@ -198,7 +198,7 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path):
         other_pkg = VnfPackageModel.objects.filter(vnfdId=vnfd_id)
         if other_pkg and other_pkg[0].vnfPackageId != vnf_pkg_id:
             logger.error("VNF package(%s,%s) already exists.", other_pkg[0].vnfPackageId, vnfd_id)
-            raise GenericparserException("VNF package(%s) already exists." % vnfd_id)
+            raise CatalogException("VNF package(%s) already exists." % vnfd_id)
         vnf_provider = vnfd["vnf"]["properties"].get("provider", "")
         vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "")
         vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "")
@@ -218,7 +218,7 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path):
             vnfPackageUri=os.path.split(vnf_pkg_path)[-1]
         )
     else:
-        raise GenericparserException("VNF propeties and metadata in VNF Package(id=%s) are empty." % vnf_pkg_id)
+        raise CatalogException("VNF propeties and metadata in VNF Package(id=%s) are empty." % vnf_pkg_id)
     logger.info('VNF package(%s) has been processed(done).' % vnf_pkg_id)