From 2375c544485790d3b10c63b868b587de3140ca85 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Thu, 26 Oct 2017 17:45:30 +0800 Subject: [PATCH] Update ns inst data save logic Change-Id: I6280c157329c1c28ed2ba37ab7e1aed1f425787c Issue-Id: VFC-558 Signed-off-by: fujinhua --- lcm/ns/ns_instant.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py index b0994d28..f1e464df 100644 --- a/lcm/ns/ns_instant.py +++ b/lcm/ns/ns_instant.py @@ -127,19 +127,21 @@ class InstantNSService(object): service_def_id=service_tpl['csarId'], template_name=service_tpl['templateName'], template_id=service_tpl['serviceTemplateId']).save() + + for key, val in self.req_data['additionalParamForNs'].items(): + InputParamMappingModel(service_id=self.ns_inst_id, + input_key=key, + input_value=val).save() + + for vnffg in ignore_case_get(plan_dict, "vnffgs"): + VNFFGInstModel(vnffgdid=vnffg["vnffg_id"], + vnffginstid=str(uuid.uuid4()), + nsinstid=self.ns_inst_id, + endpointnumber=0).save() else: # TODO: pass - for key, val in self.req_data['additionalParamForNs'].items(): - InputParamMappingModel(service_id=self.ns_inst_id, input_key=key, input_value=val).save() - - for vnffg in ignore_case_get(plan_dict, "vnffgs"): - VNFFGInstModel(vnffgdid=vnffg["vnffg_id"], - vnffginstid=str(uuid.uuid4()), - nsinstid=self.ns_inst_id, - endpointnumber=0).save() - if WORKFLOW_OPTION == "wso2": return self.start_wso2_workflow(job_id, ns_inst, plan_input) elif WORKFLOW_OPTION == "activiti": -- 2.16.6