X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fvnf_package.py;h=be735957e90b74f6407a84364c31f91bfd9159a7;hb=2ae44b787c0795e60276c35aeb13e104ca17bfa7;hp=585a599be3f86478a3d7a7e196becdad8cc795b1;hpb=5fd2ae6a4517980ce0f89247bb354220748ae67b;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 585a599..be73595 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -15,20 +15,21 @@ import json import logging import os -import sys + import threading import traceback import urllib import uuid +import zipfile +from catalog.packages import const from catalog.packages.biz.common import parse_file_range, read, save +from catalog.packages.biz.notificationsutil import prepare_vnfpkg_notification, NotificationsUtil 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 - +from catalog.pub.utils.values import ignore_case_get logger = logging.getLogger(__name__) @@ -43,16 +44,16 @@ class VnfPackage(object): vnf_pkg_id = str(uuid.uuid4()) VnfPackageModel.objects.create( vnfPackageId=vnf_pkg_id, - onboardingState=PKG_STATUS.CREATED, - operationalState=PKG_STATUS.DISABLED, - usageState=PKG_STATUS.NOT_IN_USE, + onboardingState=const.PKG_STATUS.CREATED, + operationalState=const.PKG_STATUS.DISABLED, + usageState=const.PKG_STATUS.NOT_IN_USE, userDefinedData=json.dumps(user_defined_data) ) data = { "id": vnf_pkg_id, - "onboardingState": PKG_STATUS.CREATED, - "operationalState": PKG_STATUS.DISABLED, - "usageState": PKG_STATUS.NOT_IN_USE, + "onboardingState": const.PKG_STATUS.CREATED, + "operationalState": const.PKG_STATUS.DISABLED, + "usageState": const.PKG_STATUS.NOT_IN_USE, "userDefinedData": user_defined_data, "_links": None } @@ -96,6 +97,9 @@ class VnfPackage(object): if del_vnfd_id == vnf["properties"]["descriptor_id"]: raise CatalogException('VNFD(%s) is referenced.' % del_vnfd_id) vnf_pkg.delete() + send_notification(vnf_pkg_id, const.PKG_NOTIFICATION_TYPE.CHANGE, + const.PKG_CHANGE_TYPE.PKG_DELETE) + 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) @@ -106,7 +110,7 @@ class VnfPackage(object): # if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED: # logger.error("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) + vnf_pkg.update(onboardingState=const.PKG_STATUS.UPLOADING) local_file_name = save(remote_file, vnf_pkg_id) logger.info('VNF package(%s) has been uploaded.' % vnf_pkg_id) @@ -118,7 +122,7 @@ class VnfPackage(object): if not nf_pkg.exists(): 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: + if nf_pkg[0].onboardingState != const.PKG_STATUS.ONBOARDED: raise CatalogException("VNF package (%s) is not on-boarded" % vnf_pkg_id) local_file_path = nf_pkg[0].localFilePath @@ -126,6 +130,58 @@ class VnfPackage(object): logger.info('VNF package (%s) has been downloaded.' % vnf_pkg_id) return read(local_file_path, start, end) + def download_vnfd(self, vnf_pkg_id): + logger.info('Start to download VNFD of VNF package(%s)...' % vnf_pkg_id) + nf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnf_pkg_id) + if not nf_pkg.exists(): + 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 != const.PKG_STATUS.ONBOARDED: + raise CatalogException("VNF package (%s) is not on-boarded" % vnf_pkg_id) + + vnfd_zip_file = self.creat_vnfd(vnf_pkg_id, nf_pkg[0].localFilePath) + logger.info('VNFD of VNF package (%s) has been downloaded.' % vnf_pkg_id) + return read(vnfd_zip_file, 0, os.path.getsize(vnfd_zip_file)) + + def creat_vnfd(self, vnf_pkg_id, vendor_pkg_file): + """ + Create VNFD zip file from vendor original package + :param self: + :param vnf_pkg_id: VNF package id (CSAR id) + :param vendor_pkg_file: vendor original package + :return: + """ + vnf_package_path = os.path.join(CATALOG_ROOT_PATH, vnf_pkg_id) + if not os.path.exists(vnf_package_path): + os.makedirs(vnf_package_path) + vnfd_zip_file = os.path.join(vnf_package_path, "VNFD.zip") + if os.path.exists(vnfd_zip_file): + return vnfd_zip_file + else: + if vendor_pkg_file.endswith(".csar") or vendor_pkg_file.endswith(".zip"): + try: + vnfd_path = os.path.join(vnf_package_path, "vnfd") + with zipfile.ZipFile(vendor_pkg_file, 'r') as vendor_zip: + vender_files = vendor_zip.namelist() + for vender_file in vender_files: + if str(vender_file).startswith("Definitions"): + vendor_zip.extract(vender_file, vnfd_path) + with zipfile.ZipFile(vnfd_zip_file, 'w', zipfile.ZIP_DEFLATED) as vnfd_zip: + def_path = os.path.join(vnfd_path, "Definitions") + if os.path.exists(def_path): + def_files = os.listdir(def_path) + for def_file in def_files: + full_path = os.path.join(def_path, def_file) + vnfd_zip.write(full_path, def_file) + return vnfd_zip_file + except Exception as e: + logger.error(e) + if os.path.exists(vnfd_zip): + os.remove(vnfd_zip) + raise e + finally: + fileutil.delete_dirs(vnfd_path) + class VnfPkgUploadThread(threading.Thread): def __init__(self, data, vnf_pkg_id): @@ -134,24 +190,31 @@ class VnfPkgUploadThread(threading.Thread): self.data = data self.upload_file_name = None + def vnf_pkg_upload_failed_handle(self, error_msg): + logger.error(error_msg) + logger.error(traceback.format_exc()) + vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=self.vnf_pkg_id) + if vnf_pkg and vnf_pkg[0].onboardingState == const.PKG_STATUS.UPLOADING: + vnf_pkg.update(onboardingState=const.PKG_STATUS.CREATED) + def run(self): try: self.upload_vnf_pkg_from_uri() parse_vnfd_and_save(self.vnf_pkg_id, self.upload_file_name) except CatalogException as e: - logger.error(e.args[0]) + self.vnf_pkg_upload_failed_handle(e.args[0]) except Exception as e: - logger.error(e.args[0]) - logger.error(traceback.format_exc()) - logger.error(str(sys.exc_info())) + self.vnf_pkg_upload_failed_handle(e.args[0]) def upload_vnf_pkg_from_uri(self): logger.info("Start to upload VNF packge(%s) from URI..." % self.vnf_pkg_id) vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=self.vnf_pkg_id) - if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED: + if vnf_pkg[0].onboardingState != const.PKG_STATUS.CREATED: logger.error("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) + vnf_pkg.update(onboardingState=const.PKG_STATUS.UPLOADING) + send_notification(self.vnf_pkg_id, const.PKG_NOTIFICATION_TYPE.ONBOARDING, + const.PKG_CHANGE_TYPE.OP_STATE_CHANGE) uri = ignore_case_get(self.data, "addressInformation") response = urllib.request.urlopen(uri) @@ -189,7 +252,7 @@ def fill_response_data(nf_pkg): 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) + vnf_pkg.update(onboardingState=const.PKG_STATUS.PROCESSING) vnfd_json = toscaparser.parse_vnfd(vnf_pkg_path) vnfd = json.JSONDecoder().decode(vnfd_json) @@ -211,12 +274,14 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): vnfdVersion=vnfd_ver, vnfSoftwareVersion=vnf_software_version, vnfdModel=vnfd_json, - onboardingState=PKG_STATUS.ONBOARDED, - operationalState=PKG_STATUS.ENABLED, - usageState=PKG_STATUS.NOT_IN_USE, + onboardingState=const.PKG_STATUS.ONBOARDED, + operationalState=const.PKG_STATUS.ENABLED, + usageState=const.PKG_STATUS.NOT_IN_USE, localFilePath=vnf_pkg_path, vnfPackageUri=os.path.split(vnf_pkg_path)[-1] ) + send_notification(vnf_pkg_id, const.PKG_NOTIFICATION_TYPE.ONBOARDING, + const.PKG_CHANGE_TYPE.OP_STATE_CHANGE) else: 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) @@ -224,4 +289,18 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): def handle_upload_failed(vnf_pkg_id): vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnf_pkg_id) - vnf_pkg.update(onboardingState=PKG_STATUS.CREATED) + vnf_pkg.update(onboardingState=const.PKG_STATUS.CREATED) + + +def send_notification(pkg_id, type, pkg_change_type, operational_state=None): + data = prepare_vnfpkg_notification(vnf_pkg_id=pkg_id, + notification_type=type, + pkg_change_type=pkg_change_type, + operational_state=operational_state) + filters = { + 'vnfdId': 'vnfd_id', + 'vnfPkgId': 'vnf_pkg_id' + } + logger.debug('Notify request data = %s' % data) + logger.debug('Notify request filters = %s' % filters) + NotificationsUtil().send_notification(data, filters, True)