summaryrefslogtreecommitdiffstats
path: root/tests/data_plane/configs/vpp_lite_config/basic
diff options
context:
space:
mode:
Diffstat (limited to 'tests/data_plane/configs/vpp_lite_config/basic')
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config18
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat9
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config18
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat9
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config12
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat6
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config15
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config15
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat7
32 files changed, 108 insertions, 209 deletions
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config
index c8f8e74..2a00f70 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat
deleted file mode 100644
index 47e2c87..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config
index b7a10a9..c2edf63 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat
deleted file mode 100644
index b7218f6..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config
index 1ed0c91..4927668 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config
@@ -1,9 +1,11 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+set_if_ip host-vpp1 6.0.1.1/24
+create_host_iface intervpp1 6:0:3::1/64
+set_if_ip host-intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
-set int ip address host-intervpp1 6:0:3::1/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat
deleted file mode 100644
index df5c2a9..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat
+++ /dev/null
@@ -1,9 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-
-lisp_add_del_map_resolver 6.0.3.100
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config
index 1386b42..3ec3cd5 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config
@@ -1,9 +1,11 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+set_if_ip host-vpp2 6.0.2.1/24
+create_host_iface intervpp2 6:0:3::2/64
+set_if_ip host-intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
-set int ip address host-intervpp2 6:0:3::2/64
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat
deleted file mode 100644
index 319c1fe..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat
+++ /dev/null
@@ -1,9 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-
-lisp_add_del_map_resolver 6.0.3.100
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config
index c8f8e74..be9456e 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_remote_mapping eid 6.0.2.0/24 rloc 6.0.3.2
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat
deleted file mode 100644
index f423599..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.2.0/24 rloc 6.0.3.2 p 1 w 1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config
index b7a10a9..a5e22ce 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_remote_mapping eid 6.0.1.0/24 rloc 6.0.3.1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat
deleted file mode 100644
index 8992986..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6.0.1.0/24 rloc 6.0.3.1 p 1 w 1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config
index 1a8f419..ee2eddb 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6:0:3::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_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat
deleted file mode 100644
index 14d1824..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config
index 876534b..2bcdfb7 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.2.1/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6:0:3::2/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_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat
deleted file mode 100644
index c12c6a9..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config
index 7387d9c..27b0168 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat
deleted file mode 100644
index 78a90d1..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat
+++ /dev/null
@@ -1,7 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config
index 6db6f5d..bb1d78d 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat
deleted file mode 100644
index 2a42afd..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat
+++ /dev/null
@@ -1,8 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
-
-
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config
index 801ae82..7b8c4f1 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6:0:3::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_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat
deleted file mode 100644
index 44af4ac..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config
index fa97c7d..1ad4db6 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6:0:3::2/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_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat
deleted file mode 100644
index 259516c..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config
index 801ae82..ac344c9 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config
@@ -1,7 +1,7 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6:0:1::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6:0:3::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_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_remote_mapping eid 6:0:2::0/64 rloc 6:0:3::2
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat
deleted file mode 100644
index 7d223d9..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:2::0/64 rloc 6:0:3::2 p 1 w 1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config
index fa97c7d..8023062 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:2::1/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6:0:3::2/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_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_remote_mapping eid 6:0:1::0/64 rloc 6:0:3::1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat
deleted file mode 100644
index 01882ae..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:1::0/64 rloc 6:0:3::1 p 1 w 1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config
index 598b09b..6825e21 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config
@@ -1,8 +1,9 @@
-create host-interface name vpp1
-set int state host-vpp1 up
-set int ip address host-vpp1 6.0.1.1/24
-set interface l2 bridge host-vpp1 10
+create_host_iface vpp1 6.0.1.1/24
+set_if_l2_bridge host-vpp1 10
+create_host_iface intervpp1 6.0.3.1/24
-create host-interface name intervpp1
-set int state host-intervpp1 up
-set int ip address host-intervpp1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat
deleted file mode 100644
index 4b95384..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat
+++ /dev/null
@@ -1,7 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config
index 76c1d0c..d23c11e 100644
--- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config
@@ -1,8 +1,9 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6.0.1.2/24
-set interface l2 bridge host-vpp2 10
+create_host_iface vpp2 6.0.1.2/24
+set_if_l2_bridge host-vpp2 10
+create_host_iface intervpp2 6.0.3.2/24
-create host-interface name intervpp2
-set int state host-intervpp2 up
-set int ip address host-intervpp2 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat
deleted file mode 100644
index 55a24c0..0000000
--- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat
+++ /dev/null
@@ -1,7 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1
-lisp_eid_table_add_del_map vni 10 bd_index 10
-lisp_add_del_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
-lisp_add_del_map_resolver 6.0.3.100