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.config6
-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.config6
-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.config8
-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.config8
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config6
-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.config10
-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.config10
-rw-r--r--tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat7
32 files changed, 109 insertions, 106 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 5648c20..c8f8e74 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6.0.1.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 enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6.0.1.0/24 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..47e2c87
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat
@@ -0,0 +1,6 @@
+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 1bac043..b7a10a9 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6.0.2.1/24
create host-interface name intervpp2
set int state host-intervpp2 up
set int ip address host-intervpp2 6.0.3.2/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6.0.2.0/24 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..b7218f6
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat
@@ -0,0 +1,6 @@
+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 9cef140..1ed0c91 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
@@ -7,11 +7,3 @@ 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 enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6.0.1.0/24 locator-set ls1
-lisp eid-table add eid 6:0:1::0/64 locator-set ls1
-lisp map-resolver add 6.0.3.100
-lisp map-resolver add 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
new file mode 100644
index 0000000..df5c2a9
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat
@@ -0,0 +1,9 @@
+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 7c845f6..1386b42 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
@@ -7,11 +7,3 @@ 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 enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6.0.2.0/24 locator-set ls1
-lisp eid-table add eid 6:0:2::0/64 locator-set ls1
-lisp map-resolver add 6.0.3.100
-lisp map-resolver add 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
new file mode 100644
index 0000000..319c1fe
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat
@@ -0,0 +1,9 @@
+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 681e426..c8f8e74 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6.0.1.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 enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6.0.1.0/24 locator-set ls1
-lisp remote-mapping add vni 0 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
new file mode 100644
index 0000000..f423599
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat
@@ -0,0 +1,6 @@
+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 f0fb6f0..b7a10a9 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6.0.2.1/24
create host-interface name intervpp2
set int state host-intervpp2 up
set int ip address host-intervpp2 6.0.3.2/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6.0.2.0/24 locator-set ls1
-lisp remote-mapping add vni 0 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
new file mode 100644
index 0000000..8992986
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat
@@ -0,0 +1,6 @@
+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 248eca4..1a8f419 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6.0.1.1/24
create host-interface name intervpp1
set int state host-intervpp1 up
set int ip address host-intervpp1 6:0:3::1/64
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6.0.1.0/24 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..14d1824
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat
@@ -0,0 +1,6 @@
+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 5f248ad..876534b 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6.0.2.1/24
create host-interface name intervpp2
set int state host-intervpp2 up
set int ip address host-intervpp2 6:0:3::2/64
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6.0.2.0/24 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..c12c6a9
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat
@@ -0,0 +1,6 @@
+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 d4788c2..7387d9c 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6:0:1::1/64
create host-interface name intervpp1
set int state host-intervpp1 up
set int ip address host-intervpp1 6.0.3.1/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6:0:1::0/64 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..78a90d1
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat
@@ -0,0 +1,7 @@
+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 cbfa148..6db6f5d 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6:0:2::1/64
create host-interface name intervpp2
set int state host-intervpp2 up
set int ip address host-intervpp2 6.0.3.2/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6:0:2::0/64 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..2a42afd
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat
@@ -0,0 +1,8 @@
+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 b064a57..801ae82 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6:0:1::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 enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6:0:1::0/64 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..44af4ac
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat
@@ -0,0 +1,6 @@
+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 d8ace86..fa97c7d 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6:0:2::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 enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6:0:2::0/64 locator-set ls1
-lisp map-resolver add 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
new file mode 100644
index 0000000..259516c
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat
@@ -0,0 +1,6 @@
+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 91bd1ef..801ae82 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
@@ -5,9 +5,3 @@ set int ip address host-vpp1 6:0:1::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 enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp eid-table add eid 6:0:1::0/64 locator-set ls1
-lisp remote-mapping add vni 0 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
new file mode 100644
index 0000000..7d223d9
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat
@@ -0,0 +1,6 @@
+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 8552e28..fa97c7d 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
@@ -5,9 +5,3 @@ set int ip address host-vpp2 6:0:2::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 enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp eid-table add eid 6:0:2::0/64 locator-set ls1
-lisp remote-mapping add vni 0 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
new file mode 100644
index 0000000..01882ae
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat
@@ -0,0 +1,6 @@
+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 f58c606..598b09b 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,16 +1,8 @@
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-interface name intervpp1
set int state host-intervpp1 up
set int ip address host-intervpp1 6.0.3.1/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
-lisp map-resolver add 6.0.3.100
-
-lisp eid-table map vni 10 bd 10
-set interface l2 bridge host-vpp1 10
-lisp eid-table add vni 10 eid 08:11:11:11:11:11 locator-set ls1
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
new file mode 100644
index 0000000..4b95384
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat
@@ -0,0 +1,7 @@
+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 97dc81e..76c1d0c 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,16 +1,8 @@
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-interface name intervpp2
set int state host-intervpp2 up
set int ip address host-intervpp2 6.0.3.2/24
-
-lisp enable
-
-lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
-lisp map-resolver add 6.0.3.100
-
-lisp eid-table map vni 10 bd 10
-set interface l2 bridge host-vpp2 10
-lisp eid-table add vni 10 eid 08:22:22:22:22:22 locator-set ls1
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
new file mode 100644
index 0000000..55a24c0
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat
@@ -0,0 +1,7 @@
+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