From 6ea9f472873e76a17a623f4254e810db9124c54d Mon Sep 17 00:00:00 2001 From: biancunkang Date: Wed, 22 Aug 2018 15:40:00 +0800 Subject: [PATCH] Deal with nfPackage Change-Id: Iee6b610f740864fe56873678159b25c663e02cc1 Issue-ID: VFC-1038 Signed-off-by: biancunkang --- catalog/packages/biz/nf_package.py | 18 ++++++++++++++++++ catalog/packages/serializers/vnf_pkg_info.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/catalog/packages/biz/nf_package.py b/catalog/packages/biz/nf_package.py index 9f0eae01..b660d07b 100644 --- a/catalog/packages/biz/nf_package.py +++ b/catalog/packages/biz/nf_package.py @@ -19,6 +19,7 @@ import sys import threading import traceback import urllib2 +import uuid from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH, MSB_SERVICE_IP from catalog.pub.config.config import REG_TO_MSB_REG_PARAM @@ -78,6 +79,23 @@ def parse_vnfd(csar_id, inputs): return [0, ret] +def create_vnf_pkg(data): + user_defined_data = ignore_case_get(data, "userDefinedData") + vnfPkgId = str(uuid.uuid4()) + VnfPackageModel.objects.create( + vnfPackageId=vnfPkgId + ) + data = { + "id": vnfPkgId, + "onboardingState": "CREATED", + "operationalState": "DISABLED", + "usageState": "NOT_IN_USE", + "userDefinedData": user_defined_data, + "_links": None + } + return data + + class NfDistributeThread(threading.Thread): """ Sdc NF Package Distribute diff --git a/catalog/packages/serializers/vnf_pkg_info.py b/catalog/packages/serializers/vnf_pkg_info.py index c6f72735..4c63a463 100644 --- a/catalog/packages/serializers/vnf_pkg_info.py +++ b/catalog/packages/serializers/vnf_pkg_info.py @@ -103,5 +103,5 @@ class VnfPkgInfoSerializer(serializers.Serializer): _links = _LinkSerializer( help_text='Links to resources related to this resource.', required=True, - allow_null=False + allow_null=True # TODO supposed to be False ) -- 2.16.6