X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fadaptor.py;h=6cda0af0fb077aeddca5e84d46fb9e8e53b1f95c;hb=8ccc938635ceb5079c63a5cb20cf804a9954a8b4;hp=3c5af44ee53b44230f57cc3b9ea953a0d3f04033;hpb=b7f679695743d0c2a046997bf4a6ed5ae0ac1e43;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py
index 3c5af44e..6cda0af0 100644
--- a/lcm/lcm/pub/vimapi/adaptor.py
+++ b/lcm/lcm/pub/vimapi/adaptor.py
@@ -252,9 +252,10 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type):
         raise VimException(err_msg % (port_ref_vdu_id, port["cp_id"]), ERR_CODE)
     network_id = ignore_case_get(port, "networkId")
     subnet_id = ignore_case_get(port, "subnetId")
-    if port["vl_id"] == "":
-        return
+
     if not network_id:
+        if port["vl_id"] == "":
+            return
         network_id = get_res_id(res_cache, RES_NETWORK, port["vl_id"])
         subnet_id = get_res_id(res_cache, RES_SUBNET, port["vl_id"])
     param = {
@@ -264,13 +265,17 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type):
     set_opt_val(param, "subnetId", subnet_id)
     set_opt_val(param, "macAddress", ignore_case_get(port["properties"], "mac_address"))
     ip_address = []
+    logger.debug("port['properties']:%s" % port["properties"])
     for one_protocol_data in port["properties"]["protocol_data"]:
         l3_address_data = one_protocol_data["address_data"]["l3_address_data"]  # l3 is not 13
         fixed_ip_address = ignore_case_get(l3_address_data, "fixed_ip_address")
         ip_address.extend(fixed_ip_address)
     for one_virtual_network_interface in port["properties"].get("virtual_network_interface_requirements", []):
-        interfaceTypeString = one_virtual_network_interface["network_interface_requirements"]["interfaceType"]
-        interfaceType = json.loads(interfaceTypeString)["configurationValue"]
+        network_interface_requirements = one_virtual_network_interface["network_interface_requirements"]
+        interfaceTypeString = ignore_case_get(network_interface_requirements, "interfaceType")
+        interfaceType = ""
+        if interfaceTypeString != "":
+            interfaceType = json.loads(interfaceTypeString)["configurationValue"]
         vnic_type = ignore_case_get(port["properties"], "vnic_type")
         if vnic_type == "":
             if interfaceType == "SR-IOV":
@@ -402,6 +407,8 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type):
 
     ret = api.create_vm(vim_id, tenant_id, param)
     ret["ports"] = [nic.get("portId") for nic in param["nicArray"]]
+    ret["vimId"] = vim_id
+    ret["tenantId"] = tenant_id
     do_notify(res_type, ret)
     vm_id = ret["id"]
     if ignore_case_get(ret, "name"):
@@ -524,7 +531,7 @@ def create_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type):
     }
     ret = api.create_vm_port(vim_id, tenant_id, vm_id, param)
     ret["nodeId"] = port["cp_id"]
-    do_notify(res_type, ret)
+    do_notify("create", res_type, ret)
 
 
 def delete_port_of_vm(vim_cache, res_cache, data, port, do_notify, res_type):