From c187cc4423e6da0377a661cd5d5770ffbfa046f7 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Mon, 24 Apr 2017 11:27:02 +0800 Subject: [PATCH] Modify code of gvnfm vnflcm Change-Id: Ie9b0d69fb4d0ed9acadf5f493c9bd7f1bc85d705 Issue-Id: GVNFM-50 Signed-off-by: ying.yunlong --- lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py index a34ad8f3..d242bd8d 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -214,7 +214,7 @@ class InstVnf(Thread): 'resourceName': vs.name, 'resourceType': 'volume'}}) content_args = { "status": 'result', - "nfInstanceId": self.nf_inst_id, + "vnfInstanceId": self.nf_inst_id, "operation": 'instantiate', "jobId": self.job_id, 'affectedVnfc': affected_vnfc, @@ -222,6 +222,10 @@ class InstVnf(Thread): 'affectedVirtualStorage': affected_vs, 'affectedCp': affected_cp } + vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) + if len(vnfmInfo) == 0: + raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id) + content_args['VNFMID'] = vnfmInfo[0].vnfminstid logger.info('content_args=%s' % content_args) resp = notify_lcm_to_nfvo(json.dumps(content_args)) logger.info('[NF instantiation] get lcm response %s' % resp) -- 2.16.6