Pass VNF parameters to VNFM

Change-Id: I70072ddf29f1c266d4698db703ff3dbf8c499683
Issue-ID: VFC-724
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>

diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py
index 5c2d363..41c9bf3 100644 (file)
--- a/lcm/ns/ns_instant.py
+++ b/lcm/ns/ns_instant.py
@@ -93,6 +93,7 @@ class InstantNSService(object):
                 params_vnf.append({
                     "vnfProfileId": vnf["vnf_id"],
                     "additionalParam": {
+                        "properties": json.JSONEncoder().encode(vnf['properties']),
                         "vimId": vimid,
                         "vnfmInstanceId": vnfm_info["vnfmId"],
                         "vnfmType": vnfm_type,

diff --git a/lcm/ns/vnfs/create_vnfs.py b/lcm/ns/vnfs/create_vnfs.py
index 3d85bd1..facffd8 100644 (file)
--- a/lcm/ns/vnfs/create_vnfs.py
+++ b/lcm/ns/vnfs/create_vnfs.py
@@ -93,6 +93,7 @@ class CreateVnfs(Thread):
         additional_vnf_info = self.data['additional_param_for_vnf'][vnf_index]
         self.vnf_id = ignore_case_get(additional_vnf_info, 'vnfProfileId')
         additional_param = ignore_case_get(additional_vnf_info, 'additionalParam')
+        self.properties = ignore_case_get(additional_param, 'properties')
         self.vnfm_inst_id = ignore_case_get(additional_param, 'vnfmInstanceId')
         para = ignore_case_get(additional_param, 'inputs')
         self.inputs = json.loads(para) if isinstance(para, (str, unicode)) else para
@@ -184,6 +185,7 @@ class CreateVnfs(Thread):
             'vnfDescriptorId': self.vnfd_id,
             'extVirtualLink': ext_virtual_link,
             'additionalParam': {
+                "properties": self.properties,
                 "inputs": self.inputs,
                 "vimId": self.vim_id,
                 "extVirtualLinks": virtual_link_list