Add lcm notify call in vnf inst and term

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / create_vnf.py

diff --git a/lcm/lcm/nf/biz/create_vnf.py b/lcm/lcm/nf/biz/create_vnf.py
index de857b6..fc0891a 100644 (file)
--- a/lcm/lcm/nf/biz/create_vnf.py
+++ b/lcm/lcm/nf/biz/create_vnf.py
@@ -47,17 +47,18 @@ class CreateVnf:
 
     def save_db(self):
         metadata = ignore_case_get(self.vnfd_info, "metadata")
-        version = ignore_case_get(metadata, "csarVersion")
-        provider = ignore_case_get(metadata, "csarProvider")
-        netype = ignore_case_get(metadata, "type")
-        vnfsoftwareversion = ignore_case_get(metadata, "version")
+        version = ignore_case_get(metadata, "csarVersion", "undefined")
+        provider = ignore_case_get(metadata, "csarProvider", "undefined")
+        netype = ignore_case_get(metadata, "type", "undefined")
+        vnfsoftwareversion = ignore_case_get(metadata, "version", "undefined")
         NfInstModel.objects.create(nfinstid=self.nf_inst_id,
+                                   vnfminstid=ignore_case_get(self.data, "vnfmInstId", "undefined"),
                                    nf_name=self.vnf_instance_mame,
                                    package_id=self.csar_id,
                                    version=version,
                                    vendor=provider,
                                    netype=netype,
-                                   vnfd_model=self.vnfd_info,
+                                   vnfd_model=json.dumps(self.vnfd_info),
                                    status='NOT_INSTANTIATED',
                                    nf_desc=self.description,
                                    vnfdid=self.csar_id,