4 files changed, 20 insertions, 52 deletions
diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config
index 60a6e36..5fa5a59 100644
--- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config
@@ -1,13 +1,11 @@
-create host-interface name vpp1_cus1
-set int state host-vpp1_cus1 up
-set interface ip6 table host-vpp1_cus1 100
-set int ip address host-vpp1_cus1 6:0:2::1/64
+create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100
+create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200
+create_host_iface intervpp1 6:0:3::1/64
 
-create host-interface name vpp1_cus2
-set int state host-vpp1_cus2 up
-set interface ip6 table host-vpp1_cus2 200
-set int ip address host-vpp1_cus2 6:0:2::1/64
-
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat
deleted file mode 100644
index d329837..0000000
--- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat
+++ /dev/null
@@ -1,14 +0,0 @@
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2
diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config
index 43e0727..8d18c31 100644
--- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config
@@ -1,13 +1,11 @@
-create host-interface name vpp2_cus1
-set int state host-vpp2_cus1 up
-set interface ip6 table host-vpp2_cus1 100
-set int ip address host-vpp2_cus1 6:0:4::1/64
+create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100
+create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200
+create_host_iface intervpp2 6:0:3::2/64
 
-create host-interface name vpp2_cus2
-set int state host-vpp2_cus2 up
-set interface ip6 table host-vpp2_cus2 200
-set int ip address host-vpp2_cus2 6:0:4::1/64
-
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_map_resolver 6:0:3::100
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_vrf 100 100
+lisp_eid_map_vrf 200 200
+lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
+lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat
deleted file mode 100644
index e25650c..0000000
--- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat
+++ /dev/null
@@ -1,14 +0,0 @@
-lisp_enable_disable enable
-lisp_add_del_map_resolver 6:0:3::100
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator_set locator-set ls2
-
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1
-
-lisp_eid_table_add_del_map vni 200 vrf 200
-lisp_eid_table_add_del_map vni 100 vrf 100
-
-lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1
-lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2