From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Fri, 3 Mar 2017 01:38:02 +0000 (+0800)
Subject: Modify code of vnf instantiation
X-Git-Tag: release/mercury~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=3a3c17eab2bc490b9468c6ff0c0a248081ecab9f

Modify code of vnf instantiation

Change-Id: I09dea83b0958e20bdf036bbde511a848cde988db
Issue-Id: GVNFM-43
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index f368271e..8f421ab5 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -71,7 +71,16 @@ inst_req_data = {
         }
     ],
     "localizationLanguage": "en_US",
-    "additionalParams": {}
+    "additionalParams": {"inputs": {"key1":"test1","key2":"test2"},
+                         "extVirtualLinks": [{
+                            "vlInstanceId": '55',
+                            "resourceId": '55_network',
+                            "resourceSubnetId": '55_subnet',
+                            "cpdId": 'cpId1',
+                            "vim": {
+                                "vimid": '55_vimid'
+                            }
+                        }]}
 }
 
 vnfd_rawdata = {
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index aa72c4e7..3078dbda 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@ -76,7 +76,8 @@ class InstVnf(Thread):
 
         JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id')
         input_parameters = []
-        for key, val in self.data['additionalParams'].items():
+        inputs = ignore_case_get(self.data['additionalParams'], "inputs")
+        for key, val in inputs.items():
             input_parameters.append({"key": key, "value": val})
         raw_data = query_rawdata_from_catalog(self.package_id, input_parameters)
         self.vnfd_info = toscautil.convert_vnfd_model(raw_data["rawData"])  # convert to inner json