Create port refer to the new DM datamodel

Change-Id: Ie3c2e43cce6ca9cc195447c11f2a170519e0bd1d
Issue-ID: VFC-870
Signed-off-by: Kailun Qin <kailun.qin@intel.com>

diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py
index 3264f94..4ce0e69 100644 (file)
--- a/lcm/lcm/pub/vimapi/adaptor.py
+++ b/lcm/lcm/pub/vimapi/adaptor.py
@@ -194,7 +194,8 @@ 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"))
-    set_opt_val(param, "ip", ignore_case_get(port["properties"], "ip_address"))
+    l3_address_data = port["properties"]["protocol_data"]["address_data"]["l3_address_data"]
+    set_opt_val(param, "ip", ignore_case_get(l3_address_data, "fixed_ip_address"))
     set_opt_val(param, "vnicType", ignore_case_get(port["properties"], "vnic_type"))
     set_opt_val(param, "securityGroups", "")   # TODO
     vim_id, tenant_name = location_info["vimid"], location_info["tenant"]

diff --git a/lcm/lcm/samples/tests.py b/lcm/lcm/samples/tests.py
index 9c57d84..c626675 100644 (file)
--- a/lcm/lcm/samples/tests.py
+++ b/lcm/lcm/samples/tests.py
@@ -204,9 +204,16 @@ inst_res_data = {
     ],
     "cps": [
         {
+
             "properties": {
                 "name": "vNat_big_subnet_port",
-                "ip_address": "10.43.38.253",
+                "protocol_data": {
+                    "address_data": {
+                        "l3_address_data": {
+                            "fixed_ip_address": "10.43.38.253"
+                        },
+                    },
+                },
                 "vnic_type": "normal",
                 "role": "root",
                 "virtual_network_interface_requirements": [