X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fsdc_vnf_package.py;fp=genericparser%2Fpackages%2Fbiz%2Fsdc_vnf_package.py;h=571c3bb00b2679a828db520dd7abd3b39516b86a;hb=5fd2ae6a4517980ce0f89247bb354220748ae67b;hp=3a271b7ce9f88f80da32f0cc68752f5a4fc765b4;hpb=842a4fd77b1c9f93a4b97bd7f138c9b35a855d13;p=modeling%2Fetsicatalog.git diff --git a/genericparser/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py similarity index 84% rename from genericparser/packages/biz/sdc_vnf_package.py rename to catalog/packages/biz/sdc_vnf_package.py index 3a271b7..571c3bb 100644 --- a/genericparser/packages/biz/sdc_vnf_package.py +++ b/catalog/packages/biz/sdc_vnf_package.py @@ -19,15 +19,15 @@ import sys import threading import traceback -from genericparser.packages.const import PKG_STATUS -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 VnfPackageModel -from genericparser.pub.exceptions import GenericparserException -from genericparser.pub.msapi import sdc -from genericparser.pub.utils import fileutil -from genericparser.pub.utils import toscaparsers -from genericparser.pub.utils.jobutil import JobUtil +from catalog.packages.const import PKG_STATUS +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 VnfPackageModel +from catalog.pub.exceptions import CatalogException +from catalog.pub.msapi import sdc +from catalog.pub.utils import fileutil +from catalog.pub.utils import toscaparser +from catalog.pub.utils.jobutil import JobUtil logger = logging.getLogger(__name__) @@ -38,7 +38,7 @@ def nf_get_csars(): ret = None try: ret = NfPackage().get_csars() - except GenericparserException as e: + except CatalogException as e: return [1, e.args[0]] except Exception as e: logger.error(e.args[0]) @@ -51,7 +51,7 @@ def nf_get_csar(csar_id): ret = None try: ret = NfPackage().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]) @@ -65,10 +65,10 @@ def parse_vnfd(csar_id, inputs): try: nf_pkg = VnfPackageModel.objects.filter(vnfPackageId=csar_id) if not nf_pkg: - raise GenericparserException("VNF CSAR(%s) does not exist." % csar_id) + raise CatalogException("VNF CSAR(%s) does not exist." % csar_id) csar_path = nf_pkg[0].localFilePath - ret = {"model": toscaparsers.parse_vnfd(csar_path, inputs)} - except GenericparserException as e: + ret = {"model": toscaparser.parse_vnfd(csar_path, inputs)} + except CatalogException as e: return [1, e.args[0]] except Exception as e: logger.error(e.args[0]) @@ -89,12 +89,12 @@ class NfDistributeThread(threading.Thread): self.lab_vim_id = lab_vim_id self.job_id = job_id - self.csar_save_path = os.path.join(GENERICPARSER_ROOT_PATH, csar_id) + self.csar_save_path = os.path.join(CATALOG_ROOT_PATH, csar_id) def run(self): try: self.on_distribute() - except GenericparserException as e: + except CatalogException as e: self.rollback_distribute() JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0]) except Exception as e: @@ -118,7 +118,7 @@ class NfDistributeThread(threading.Thread): return artifact = sdc.get_artifact(sdc.ASSETTYPE_RESOURCES, self.csar_id) - local_path = os.path.join(GENERICPARSER_ROOT_PATH, self.csar_id) + local_path = os.path.join(CATALOG_ROOT_PATH, self.csar_id) csar_name = "%s.csar" % artifact.get("name", self.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"): @@ -126,16 +126,16 @@ class NfDistributeThread(threading.Thread): if os.path.exists(artifact_vnf_file): local_file_name = artifact_vnf_file - vnfd_json = toscaparsers.parse_vnfd(local_file_name) + vnfd_json = toscaparser.parse_vnfd(local_file_name) vnfd = json.JSONDecoder().decode(vnfd_json) if not vnfd.get("vnf"): - raise GenericparserException("VNF properties and metadata in VNF Package(id=%s) are empty." % self.csar_id) + raise CatalogException("VNF properties and metadata in VNF Package(id=%s) are empty." % self.csar_id) vnfd_id = vnfd["vnf"]["properties"].get("descriptor_id", "") if VnfPackageModel.objects.filter(vnfdId=vnfd_id): logger.error("VNF package(%s) already exists.", vnfd_id) - raise GenericparserException("VNF package(%s) already exists." % vnfd_id) + raise CatalogException("VNF package(%s) already exists." % vnfd_id) JobUtil.add_job_status(self.job_id, 30, "Save CSAR(%s) to database." % self.csar_id) vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "") vnf_provider = vnfd["vnf"]["properties"].get("provider", "") @@ -180,7 +180,7 @@ class NfPkgDeleteThread(threading.Thread): def run(self): try: self.delete_csar() - except GenericparserException as e: + except CatalogException as e: JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0]) except Exception as e: logger.error(e.args[0]) @@ -200,7 +200,7 @@ class NfPkgDeleteThread(threading.Thread): JobUtil.add_job_status(self.job_id, 50, "Delete local CSAR(%s) file." % self.csar_id) - csar_save_path = os.path.join(GENERICPARSER_ROOT_PATH, self.csar_id) + csar_save_path = os.path.join(CATALOG_ROOT_PATH, self.csar_id) fileutil.delete_dirs(csar_save_path) JobUtil.add_job_status(self.job_id, 100, "Delete CSAR(%s) successfully." % self.csar_id) @@ -240,11 +240,11 @@ class NfPackage(object): pkg_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, db_csar_id, nf_pkg[0].vnfPackageUri) else: - raise GenericparserException("Vnf package[%s] not Found." % csar_id) + raise CatalogException("Vnf package[%s] not Found." % csar_id) csar_info = { "csarId": db_csar_id,