X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_create%2Finst_vnf.py;h=0727844efe31f48726725248753670ac77de2260;hb=f74e80669eb2ea45755fd7b111bfa7852c4a03f2;hp=6bc996fb57a2bffeee61fa91ec924873abb98523;hpb=19fce59efa91c1e37b64098ce6e99b2c90eb8f05;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index 6bc996fb..0727844e 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@ -90,7 +90,7 @@ class InstVnf(Thread):
             self.inst_pre()
             self.apply_grant()
             self.create_res()
-            self.lcm_notify()
+            # self.lcm_notify()
             JobUtil.add_job_status(self.job_id, 100, "Instantiate Vnf success.")
             # is_exist = JobStatusModel.objects.filter(jobid=self.job_id).exists()
             # logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist)
@@ -438,14 +438,18 @@ class InstVnf(Thread):
             JobUtil.add_job_status(self.job_id, 50, 'Create ports!')
             PortInstModel.objects.create(
                 portid=str(uuid.uuid4()),
-                networkid=ret["networkId"],
-                subnetworkid=ret["subnetId"],
-                vimid=ret["vimId"],
-                resouceid=ret["id"],
-                name=ret["name"],
-                tenant=ret["tenatId"],
+                networkid=ignore_case_get(ret, "networkId"),
+                subnetworkid=ignore_case_get(ret, "subnetId"),
+                name=ignore_case_get(ret, "name"),
+                vimid=ignore_case_get(ret, "vimId"),
+                resouceid=ignore_case_get(ret, "id"),
+                tenant=ignore_case_get(ret, "tenantId"),
+                macaddress = ignore_case_get(ret, "macAddress"),
+                ipaddress = ignore_case_get(ret, "ip"),
+                typevirtualnic=ignore_case_get(ret, "vnicType"),
+                securityGroups=ignore_case_get(ret, "securityGroups"),
                 insttype=0,
-                is_predefined=ret["returnCode"],
+                is_predefined=ignore_case_get(ret, "returnCode"),
                 instid=self.nf_inst_id)
         elif res_type == adaptor.RES_FLAVOR:
             logger.info('Create flavors!')
@@ -455,14 +459,19 @@ class InstVnf(Thread):
             # self.inst_resource['flavor'].append({"vim_id": "1"}, {"res_id": "2"})
             JobUtil.add_job_status(self.job_id, 60, 'Create flavors!')
             FlavourInstModel.objects.create(
-                falavourid=str(uuid.uuid4()),
-                name=ret["name"],
-                vcpu=ret["vcpu"],
-                memory=ret["memory"],
-                extraspecs=ret["extraSpecs"],
-                is_predefined=ret["returnCode"],
-                tenant=ret["tenatId"],
-                vimid=ret["vimId"],
+                flavourid=str(uuid.uuid4()),
+                name=ignore_case_get(ret, "name"),
+                vimid=ignore_case_get(ret, "vimId"),
+                resouceid=ignore_case_get(ret, "id"),
+                tenant=ignore_case_get(ret, "tenantId"),
+                vcpu=ignore_case_get(ret, "vcpu"),
+                memory=ignore_case_get(ret, "memory"),
+                disk=ignore_case_get(ret, "disk"),
+                ephemeral=ignore_case_get(ret, "ephemeral"),
+                swap=ignore_case_get(ret, "swap"),
+                isPublic=get_boolean(ignore_case_get(ret, "isPublic")),
+                extraspecs=ignore_case_get(ret, "extraSpecs"),
+                is_predefined=ignore_case_get(ret, "returnCode"),
                 instid=self.nf_inst_id)
         elif res_type == adaptor.RES_VM:
             logger.info('Create vms!')
@@ -473,12 +482,21 @@ class InstVnf(Thread):
             JobUtil.add_job_status(self.job_id, 70, 'Create vms!')
             VmInstModel.objects.create(
                 vmid=str(uuid.uuid4()),
-                vimid=ret["vimId"],
-                resouceid=ret["id"],
+                vmname=ignore_case_get(ret, "name"),
+                vimid=ignore_case_get(ret, "vimId"),
+                resouceid=ignore_case_get(ret, "id"),
+                tenant=ignore_case_get(ret, "tenantId"),
+                nic_array=ignore_case_get(ret, "nicArray"),
+                metadata=ignore_case_get(ret, "metadata"),
+                volume_array=ignore_case_get(ret, "volumeArray"),
+                server_group=ignore_case_get(ret, "serverGroup"),
+                availability_zone=ignore_case_get(ret, "availabilityZone"),
+                flavor_id=ignore_case_get(ret, "flavorId"),
+                security_groups=ignore_case_get(ret, "securityGroups"),
+                operationalstate=ignore_case_get(ret, "status"),
                 insttype=0,
-                instid=self.nf_inst_id,
-                vmname=ret["name"],
-                is_predefined=ret["returnCode"])
+                is_predefined=ignore_case_get(ret, "returnCode"),
+                instid=self.nf_inst_id)
 
     # def do_rollback(self, args_=None):
     #     logger.error('error info : %s' % args_)