From: ying.yunlong Date: Wed, 27 Sep 2017 08:55:52 +0000 (+0800) Subject: Add query vnf package from vfc-nfvo-catalog X-Git-Tag: v1.0.0~21 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7ffe214a8e2b53e4744c41a974035f31c7ec4b7a;p=vfc%2Fnfvo%2Flcm.git Add query vnf package from vfc-nfvo-catalog Change-Id: Ia25938aebfc5b19f7125a65f2a1b0e6fd3e88c35 Issue-ID: VFC-465 Signed-off-by: ying.yunlong --- diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py index 55b7f610..ba6234d3 100644 --- a/lcm/ns/ns_instant.py +++ b/lcm/ns/ns_instant.py @@ -14,27 +14,27 @@ import json import logging -import traceback import time +import traceback import uuid from rest_framework import status +from lcm.pub.config.config import WORKFLOW_OPTION from lcm.pub.database.models import DefPkgMappingModel, ServiceBaseInfoModel, InputParamMappingModel -from lcm.pub.database.models import NSInstModel, NfPackageModel, VNFFGInstModel, WFPlanModel +from lcm.pub.database.models import NSInstModel, VNFFGInstModel, WFPlanModel +from lcm.pub.exceptions import NSLCMException +from lcm.pub.msapi import activiti +from lcm.pub.msapi import sdc_run_catalog from lcm.pub.msapi.catalog import get_process_id, query_rawdata_from_catalog from lcm.pub.msapi.catalog import get_servicetemplate_id, get_servicetemplate +from lcm.pub.msapi.extsys import select_vnfm from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id from lcm.pub.msapi.wso2bpel import workflow_run -from lcm.pub.msapi.extsys import select_vnfm -from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils import toscautil +from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.values import ignore_case_get -from lcm.pub.exceptions import NSLCMException -from lcm.pub.config.config import WORKFLOW_OPTION from lcm.workflows import build_in -from lcm.pub.msapi import activiti -from lcm.pub.msapi import sdc_run_catalog logger = logging.getLogger(__name__) diff --git a/lcm/ns/tests/vnfs/tests.py b/lcm/ns/tests/vnfs/tests.py index e4179617..b54d92d6 100644 --- a/lcm/ns/tests/vnfs/tests.py +++ b/lcm/ns/tests/vnfs/tests.py @@ -24,7 +24,7 @@ from lcm.ns.vnfs.create_vnfs import CreateVnfs from lcm.ns.vnfs.heal_vnfs import NFHealService from lcm.ns.vnfs.scale_vnfs import NFManualScaleService from lcm.ns.vnfs.terminate_nfs import TerminateVnfs -from lcm.pub.database.models import NfInstModel, JobModel, NfPackageModel, NSInstModel, VmInstModel +from lcm.pub.database.models import NfInstModel, JobModel, NSInstModel, VmInstModel from lcm.pub.exceptions import NSLCMException from lcm.pub.utils import restcall from lcm.pub.utils.jobutil import JOB_MODEL_STATUS @@ -77,8 +77,6 @@ class TestCreateVnfViews(TestCase): "vnfIndex": "1" } self.client = Client() - NfPackageModel(uuid=str(uuid.uuid4()), nfpackageid='package_id1', vnfdid='zte_vbras', vendor='zte', - vnfdversion='1.0.0', vnfversion='1.0.0', vnfdmodel=json.dumps(vnfd_model_dict)).save() NSInstModel(id=self.ns_inst_id, name='ns', nspackage_id='1', nsd_id='nsd_id', description='description', status='instantiating', nsd_model=json.dumps(nsd_model_dict), create_time=now_time(), lastuptime=now_time()).save() @@ -97,20 +95,6 @@ class TestCreateVnfViews(TestCase): @mock.patch.object(restcall, 'call_req') def test_create_vnf_thread(self, mock_call_req): nf_inst_id, job_id = create_vnfs.prepare_create_params() - nf_package_info = { - "csarId": "zte_vbras", - "packageInfo": { - "vnfdId": "1", - "vnfPackageId": "zte_vbras", - "vnfdProvider": "1", - "vnfdVersion": "1", - "vnfVersion": "1", - "csarName": "1", - "vnfdModel": vnfd_model_dict, - "downloadUrl": "1" - }, - "imageInfo": [] - } mock_vals = { "/api/ztevmanagerdriver/v1/1/vnfs": [0, json.JSONEncoder().encode({"jobId": self.job_id, "vnfInstanceId": 3}), '200'], @@ -1308,3 +1292,18 @@ vim_info = { ] } } + +nf_package_info = { + "csarId": "zte_vbras", + "packageInfo": { + "vnfdId": "1", + "vnfPackageId": "zte_vbras", + "vnfdProvider": "1", + "vnfdVersion": "1", + "vnfVersion": "1", + "csarName": "1", + "vnfdModel": vnfd_model_dict, + "downloadUrl": "1" + }, + "imageInfo": [] +} diff --git a/lcm/ns/vnfs/create_vnfs.py b/lcm/ns/vnfs/create_vnfs.py index 0a23ad5b..0639dc44 100644 --- a/lcm/ns/vnfs/create_vnfs.py +++ b/lcm/ns/vnfs/create_vnfs.py @@ -21,7 +21,7 @@ from lcm.ns.const import OWNER_TYPE from lcm.ns.vnfs.const import VNF_STATUS, NFVO_VNF_INST_TIMEOUT_SECOND, INST_TYPE, INST_TYPE_NAME from lcm.ns.vnfs.wait_job import wait_job_finish from lcm.pub.config.config import REPORT_TO_AAI -from lcm.pub.database.models import NfPackageModel, NfInstModel, NSInstModel, VmInstModel, VNFFGInstModel, VLInstModel +from lcm.pub.database.models import NfInstModel, NSInstModel, VmInstModel, VNFFGInstModel, VLInstModel from lcm.pub.exceptions import NSLCMException from lcm.pub.msapi.aai import create_vnf_aai, create_vserver_aai from lcm.pub.msapi.extsys import get_vnfm_by_id, split_vim_to_owner_region, get_vim_by_id @@ -128,8 +128,8 @@ class CreateVnfs(Thread): raise NSLCMException('Can not found vnf in nsd model') def check_nf_package_valid(self): - nf_package_info = query_vnfpackage_by_id(self.vnfd_id) - self.nf_package_info = nf_package_info["packageInfo"] + nfpackage_info = query_vnfpackage_by_id(self.vnfd_id) + self.nf_package_info = nfpackage_info["packageInfo"] self.vnfd_model = ignore_case_get(self.nf_package_info, "vnfdModel") def get_virtual_link_info(self, vnf_id): diff --git a/lcm/ns/vnfs/grant_vnfs.py b/lcm/ns/vnfs/grant_vnfs.py index 0bef6131..bf5335fe 100644 --- a/lcm/ns/vnfs/grant_vnfs.py +++ b/lcm/ns/vnfs/grant_vnfs.py @@ -12,12 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging import json +import logging -from lcm.pub.msapi import resmgr -from lcm.pub.database.models import NfPackageModel, NfInstModel +from lcm.pub.database.models import NfInstModel from lcm.pub.exceptions import NSLCMException +from lcm.pub.msapi import resmgr +from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id from lcm.pub.utils.values import ignore_case_get logger = logging.getLogger(__name__) @@ -62,7 +63,9 @@ class GrantVnfs(object): m_vnf_inst_id, vnfm_inst_id)) vnf_pkg_id = vnfinsts[0].package_id - vnf_pkgs = NfPackageModel.objects.filter(nfpackageid=vnf_pkg_id) + # vnf_pkgs = NfPackageModel.objects.filter(nfpackageid=vnf_pkg_id) + nfpackage_info = query_vnfpackage_by_id(vnf_pkg_id) + vnf_pkgs = nfpackage_info["packageInfo"] if not vnf_pkgs: raise NSLCMException("vnfpkg(%s) is not found" % vnf_pkg_id)