X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fcommon.py;h=bd8411d4075039086bde71e4d652cb96c65bb826;hb=3e5e393882d6c7b2cf1252d6b2ae4944efb7fe85;hp=308ba060360c6057291debdc0671e986cc156518;hpb=3e42b3c95ade30a5083b993514b6b0d0734e0075;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/common.py b/lcm/lcm/nf/biz/common.py
index 308ba060..bd8411d4 100644
--- a/lcm/lcm/nf/biz/common.py
+++ b/lcm/lcm/nf/biz/common.py
@@ -120,15 +120,17 @@ def flavor_save(job_id, nf_inst_id, ret):
 def vm_save(job_id, nf_inst_id, ret):
     JobUtil.add_job_status(job_id, 70, 'Create vms!')
     vm_id = str(uuid.uuid4())
+    nics = ignore_case_get(ret, "nicArray")
+    volumes = ignore_case_get(ret, "volumeArray")
     VmInstModel.objects.create(
         vmid=vm_id,
         vmname=ignore_case_get(ret, "name"),
         vimid=ignore_case_get(ret, "vimId"),
         resourceid=ignore_case_get(ret, "id"),
         tenant=ignore_case_get(ret, "tenantId"),
-        nic_array=ignore_case_get(ret, "nicArray"),
+        nic_array=nics if nics else "null",
         metadata=ignore_case_get(ret, "metadata"),
-        volume_array=ignore_case_get(ret, "volumeArray"),
+        volume_array=volumes if volumes else "null",
         server_group=ignore_case_get(ret, "serverGroup"),
         availability_zone=str(ignore_case_get(ret, "availabilityZone", "undefined")),
         flavor_id=ignore_case_get(ret, "flavorId"),
@@ -143,3 +145,9 @@ def vm_save(job_id, nf_inst_id, ret):
         is_predefined=ignore_case_get(ret, "returnCode"),
         instid=nf_inst_id,
         vmid=vm_id)
+    for portid in ignore_case_get(ret, "ports"):
+        PortInstModel.objects.filter(
+            resourceid=portid
+        ).update(
+            vmid=ignore_case_get(ret, "id")
+        )