diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2016-08-30 14:49:58 +0200 |
|---|---|---|
| committer | Filip Tehlar <ftehlar@cisco.com> | 2016-08-31 09:04:50 +0200 |
| commit | 1df1d674eaace35d52973786403eb1dbe3c0d5eb (patch) | |
| tree | 39546a92cb3715a957fe44f9318ae3a2cc3718bb | |
| parent | 4543d2821b1ab69579a525d83497ff84e9084bed (diff) | |
Use VAT in testsstable/1609
Change-Id: If8f08c5e998c5fbd9ea5c1f0252a77e01ea347ec
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
122 files changed, 524 insertions, 403 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 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config index c40a9c1..58d3133 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config @@ -11,14 +11,3 @@ set int ip address host-vpp1_cus2 6.0.2.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 map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6.0.2.0/24 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6.0.2.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat new file mode 100644 index 0000000..071bd31 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat @@ -0,0 +1,14 @@ +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/24 locator-set ls1 +lisp_add_del_local_eid vni 200 eid 6.0.2.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config index 8cc9e3a..db01d3f 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config @@ -11,14 +11,3 @@ set int ip address host-vpp2_cus2 6.0.4.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 map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6.0.4.0/24 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6.0.4.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat new file mode 100644 index 0000000..dd01932 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat @@ -0,0 +1,14 @@ +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/24 locator-set ls1 +lisp_add_del_local_eid vni 200 eid 6.0.4.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config index bb7eb14..f657fa9 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config @@ -11,14 +11,3 @@ set int ip address host-vpp1_cus2 6.0.2.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 map-resolver add 6:0:3::100 - -lisp locator-set add ls1 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6.0.2.0/24 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6.0.2.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.vat new file mode 100644 index 0000000..60e66a2 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.vat @@ -0,0 +1,15 @@ +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/24 locator-set ls1 +lisp_add_del_local_eid vni 200 eid 6.0.2.0/24 locator-set ls2 + diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.vat new file mode 100644 index 0000000..8316d5f --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.vat @@ -0,0 +1,14 @@ +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/24 locator-set ls1 +lisp_add_del_local_eid vni 200 eid 6.0.4.0/24 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config index ca24e79..fb877ba 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config @@ -11,14 +11,3 @@ 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/24 - -lisp enable -lisp map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:2::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:2::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat new file mode 100644 index 0000000..b6074ce --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat @@ -0,0 +1,14 @@ +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/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config index 6e41a83..7248cf0 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config @@ -11,14 +11,3 @@ 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/24 - -lisp enable -lisp map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:4::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:4::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat new file mode 100644 index 0000000..12ee36d --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat @@ -0,0 +1,14 @@ +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 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 4154dc2..60a6e36 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 @@ -11,14 +11,3 @@ 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 enable -lisp map-resolver add 6:0:3::100 - -lisp locator-set add ls1 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:2::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp1 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:2::0/64 locator-set ls2 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 new file mode 100644 index 0000000..d329837 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat @@ -0,0 +1,14 @@ +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 0e633c5..43e0727 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 @@ -11,14 +11,3 @@ 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 enable -lisp map-resolver add 6:0:3::100 - -lisp locator-set add ls1 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:4::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-intervpp2 p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:4::0/64 locator-set ls2 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 new file mode 100644 index 0000000..e25650c --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat @@ -0,0 +1,14 @@ +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 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config index 83d360b..2258354 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config @@ -9,9 +9,3 @@ set int ip address host-intervpp11 6.0.3.1/24 create host-interface name intervpp21 set int state host-intervpp21 up set int ip address host-intervpp21 6.0.4.1/24 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 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/multihoming/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.vat new file mode 100644 index 0000000..e14f78f --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/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-intervpp11 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp21 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/multihoming/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config index facd252..27424e2 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config @@ -9,9 +9,3 @@ set int ip address host-intervpp12 6.0.3.2/24 create host-interface name intervpp22 set int state host-intervpp22 up set int ip address host-intervpp22 6.0.4.2/24 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 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/multihoming/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.vat new file mode 100644 index 0000000..dd19c64 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/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-intervpp12 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp22 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/multihoming/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config index 1db0fa6..e9b2d21 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config @@ -9,9 +9,3 @@ set int ip address host-intervpp11 6:0:3::1/64 create host-interface name intervpp21 set int state host-intervpp21 up set int ip address host-intervpp21 6:0:4::1/64 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 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/multihoming/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.vat new file mode 100644 index 0000000..4bac9cd --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/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-intervpp11 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp21 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/multihoming/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config index 1c3ae51..df27bf5 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config @@ -9,9 +9,3 @@ set int ip address host-intervpp12 6:0:3::2/64 create host-interface name intervpp22 set int state host-intervpp22 up set int ip address host-intervpp22 6:0:4::2/64 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 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/multihoming/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.vat new file mode 100644 index 0000000..365524a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/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-intervpp12 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp22 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/multihoming/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config index 0b7e28f..55a2627 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config @@ -1,6 +1,7 @@ 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 intervpp11 set int state host-intervpp11 up @@ -9,12 +10,3 @@ set int ip address host-intervpp11 6.0.3.1/24 create host-interface name intervpp21 set int state host-intervpp21 up set int ip address host-intervpp21 6.0.4.1/24 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 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/multihoming/l2o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat new file mode 100644 index 0000000..974f594 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat @@ -0,0 +1,9 @@ +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 locator-set ls1 iface host-intervpp11 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp21 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 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config index ab51c13..8f13e84 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config @@ -1,6 +1,7 @@ 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 intervpp12 set int state host-intervpp12 up @@ -9,12 +10,3 @@ set int ip address host-intervpp12 6.0.3.2/24 create host-interface name intervpp22 set int state host-intervpp22 up set int ip address host-intervpp22 6.0.4.2/24 - -lisp enable - -lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 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/multihoming/l2o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat new file mode 100644 index 0000000..9ded228 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat @@ -0,0 +1,9 @@ +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 locator-set ls1 iface host-intervpp12 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-intervpp22 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 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config index fafb06c..7fd2b6f 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config @@ -1,9 +1,3 @@ create host-interface name xtr_rtr2 set int state host-xtr_rtr2 up set int ip address host-xtr_rtr2 6.0.3.3/24 - -lisp enable -lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6.0.0.0/16 action send-map-request -lisp map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config index 6aae05d..0c79fdd 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config @@ -4,9 +4,3 @@ set int ip address host-vpp1 6.0.2.1/24 create host-interface name xtr_rtr1 set int state host-xtr_rtr1 up set int ip address host-xtr_rtr1 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1 -lisp eid-table add eid 6.0.2.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.vat new file mode 100644 index 0000000..68286c5 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr1 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/rtr_single_iface/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config index 9a10dc3..f229519 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config @@ -4,9 +4,3 @@ set int ip address host-vpp2 6.0.4.1/24 create host-interface name xtr_rtr3 set int state host-xtr_rtr3 up set int ip address host-xtr_rtr3 6.0.3.2/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1 -lisp eid-table add eid 6.0.4.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.vat new file mode 100644 index 0000000..a84f369 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr3 p 1 w 1 +lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.vat new file mode 100644 index 0000000..8a87b93 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.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-xtr_rtr2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config index 8be1be2..3a80443 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config @@ -1,9 +1,3 @@ create host-interface name xtr_rtr2 set int state host-xtr_rtr2 up set int ip address host-xtr_rtr2 6:0:3::3/64 - -lisp enable -lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6.0.0.0/16 action send-map-request -lisp map-resolver add 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config index 70b5a0e..0e45e0f 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config @@ -5,9 +5,3 @@ set int ip address host-vpp1 6.0.2.1/24 create host-interface name xtr_rtr1 set int state host-xtr_rtr1 up set int ip address host-xtr_rtr1 6:0:3::1/64 - -lisp enable - -lisp map-resolver add 6:0:3::100 -lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1 -lisp eid-table add eid 6.0.2.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.vat new file mode 100644 index 0000000..6c14003 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr1 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/rtr_single_iface/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config index f75135a..8ec52e3 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config @@ -5,9 +5,3 @@ set int ip address host-vpp2 6.0.4.1/24 create host-interface name xtr_rtr3 set int state host-xtr_rtr3 up set int ip address host-xtr_rtr3 6:0:3::2/64 - -lisp enable - -lisp map-resolver add 6:0:3::100 -lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1 -lisp eid-table add eid 6.0.4.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.vat new file mode 100644 index 0000000..3ae8819 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr3 p 1 w 1 +lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.vat new file mode 100644 index 0000000..c65ecf6 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.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-xtr_rtr2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2 +lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config index 0e893f5..7fd2b6f 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config @@ -1,9 +1,3 @@ create host-interface name xtr_rtr2 set int state host-xtr_rtr2 up set int ip address host-xtr_rtr2 6.0.3.3/24 - -lisp enable -lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6:0:0::0/64 action send-map-request -lisp map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config index d689c7c..32089a2 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config @@ -5,9 +5,3 @@ set int ip address host-vpp1 6:0:2::1/64 create host-interface name xtr_rtr1 set int state host-xtr_rtr1 up set int ip address host-xtr_rtr1 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1 -lisp eid-table add eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat new file mode 100644 index 0000000..097cc6b --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/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-xtr_rtr1 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/rtr_single_iface/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config index 0f3e4ab..97a15c4 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config @@ -5,9 +5,3 @@ set int ip address host-vpp2 6:0:4::1/64 create host-interface name xtr_rtr3 set int state host-xtr_rtr3 up set int ip address host-xtr_rtr3 6.0.3.2/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1 -lisp eid-table add eid 6:0:4::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.vat new file mode 100644 index 0000000..ff1db3a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/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-xtr_rtr3 p 1 w 1 +lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.vat new file mode 100644 index 0000000..4feb7b8 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.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-xtr_rtr2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/64 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config index 081bc2e..3a80443 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config @@ -1,9 +1,3 @@ create host-interface name xtr_rtr2 set int state host-xtr_rtr2 up set int ip address host-xtr_rtr2 6:0:3::3/64 - -lisp enable -lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6:0:0::0/64 action send-map-request -lisp map-resolver add 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config index 915c49b..5618763 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config @@ -5,9 +5,3 @@ set int ip address host-vpp1 6:0:2::1/64 create host-interface name xtr_rtr1 set int state host-xtr_rtr1 up set int ip address host-xtr_rtr1 6:0:3::1/64 - -lisp enable - -lisp map-resolver add 6:0:3::100 -lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1 -lisp eid-table add eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.vat new file mode 100644 index 0000000..dce8ef8 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr1 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/rtr_single_iface/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.vat new file mode 100644 index 0000000..72507fa --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/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-xtr_rtr3 p 1 w 1 +lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.vat new file mode 100644 index 0000000..bc7259a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.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-xtr_rtr2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/64 action 2 +lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config index e18129e..a4a481e 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config @@ -5,10 +5,3 @@ set int ip address host-rtr_vpp1 6.0.3.2/24 create host-interface name rtr_vpp2 set int state host-rtr_vpp2 up set int ip address host-rtr_vpp2 6.0.5.2/24 - -lisp enable - -lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6.0.0.0/16 action send-map-request -lisp map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config index 4ef387e..066d34e 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config @@ -4,10 +4,3 @@ set int ip address host-vpp1 6.0.2.1/24 create host-interface name vpp1_rtr set int state host-vpp1_rtr up set int ip address host-vpp1_rtr 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-vpp1_rtr p 1 w 1 -lisp eid-table add eid 6.0.2.0/24 locator-set ls1 - diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.vat new file mode 100644 index 0000000..d4ca711 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/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-vpp1_rtr 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/rtr_two_iface/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.config index ff7af94..26b7e7a 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.config @@ -4,9 +4,3 @@ set int ip address host-vpp2 6.0.4.1/24 create host-interface name vpp2_rtr set int state host-vpp2_rtr up set int ip address host-vpp2_rtr 6.0.5.1/24 - -lisp enable - -lisp map-resolver add 6.0.5.100 -lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1 -lisp eid-table add eid 6.0.4.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.vat new file mode 100644 index 0000000..3262c09 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/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-vpp2_rtr p 1 w 1 +lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_add_del_map_resolver 6.0.5.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.vat new file mode 100644 index 0000000..ecb238a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.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-rtr_vpp1 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config index 07fe676..a70a2c9 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config @@ -5,10 +5,3 @@ set int ip address host-rtr_vpp1 6:0:3::2/64 create host-interface name rtr_vpp2 set int state host-rtr_vpp2 up set int ip address host-rtr_vpp2 6:0:5::2/64 - -lisp enable - -lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 -lisp pitr ls ls1 -lisp remote-mapping eid 6.0.0.0/16 action send-map-request -lisp map-resolver add 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.config index b2c523b..449cd58 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.config @@ -4,9 +4,3 @@ set int ip address host-vpp1 6.0.2.1/24 create host-interface name vpp1_rtr set int state host-vpp1_rtr up set int ip address host-vpp1_rtr 6:0:3::1/64 - -lisp enable - -lisp map-resolver add 6:0:3::100 -lisp locator-set add ls1 iface host-vpp1_rtr p 1 w 1 -lisp eid-table add eid 6.0.2.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.vat new file mode 100644 index 0000000..2948ec8 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/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-vpp1_rtr 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/rtr_two_iface/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.config index 27d58b5..efff7b3 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.config @@ -4,9 +4,3 @@ set int ip address host-vpp2 6.0.4.1/24 create host-interface name vpp2_rtr set int state host-vpp2_rtr up set int ip address host-vpp2_rtr 6:0:5::1/64 - -lisp enable - -lisp map-resolver add 6:0:5::100 -lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1 -lisp eid-table add eid 6.0.4.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.vat new file mode 100644 index 0000000..8aa96ca --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/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-vpp2_rtr p 1 w 1 +lisp_add_del_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_add_del_map_resolver 6:0:5::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.vat new file mode 100644 index 0000000..02794af --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.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-rtr_vpp1 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6.0.0.0/16 action 2 +lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config index df53d93..03614b5 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config @@ -5,11 +5,3 @@ set int ip address host-rtr_vpp1 6.0.3.2/24 create host-interface name rtr_vpp2 set int state host-rtr_vpp2 up set int ip address host-rtr_vpp2 6:0:5::2/64 - -lisp enable - -lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 -lisp pitr ls ls1 -comment { lisp pitr disable } -lisp remote-mapping eid 6:0:0::0/32 action send-map-request -lisp map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config index 72e460b..24a23b5 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config @@ -4,9 +4,3 @@ set int ip address host-vpp1 6:0:2::1/64 create host-interface name vpp1_rtr set int state host-vpp1_rtr up set int ip address host-vpp1_rtr 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-vpp1_rtr p 1 w 1 -lisp eid-table add eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.vat new file mode 100644 index 0000000..a01f7a8 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/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-vpp1_rtr 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/rtr_two_iface/6o46/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config index eddefba..8a5fe7f 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config @@ -4,9 +4,3 @@ set int ip address host-vpp2 6:0:4::1/64 create host-interface name vpp2_rtr set int state host-vpp2_rtr up set int ip address host-vpp2_rtr 6:0:5::1/64 - -lisp enable - -lisp map-resolver add 6:0:5::100 -lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1 -lisp eid-table add eid 6:0:4::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.vat new file mode 100644 index 0000000..134b24f --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/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-vpp2_rtr p 1 w 1 +lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_add_del_map_resolver 6:0:5::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.vat new file mode 100644 index 0000000..06a522a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.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-rtr_vpp1 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/32 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config index 3e795f7..03614b5 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config @@ -5,14 +5,3 @@ set int ip address host-rtr_vpp1 6.0.3.2/24 create host-interface name rtr_vpp2 set int state host-rtr_vpp2 up set int ip address host-rtr_vpp2 6:0:5::2/64 - -lisp enable - -lisp map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 -lisp pitr ls ls1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table map vni 200 vrf 200 -lisp remote-mapping vni 100 eid 6:0:0::0/32 action send-map-request -lisp remote-mapping vni 200 eid 6:0:0::0/32 action send-map-request diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config index 3f8d436..5b5452e 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config @@ -11,14 +11,3 @@ set int ip address host-vpp1_cus2 6:0:2::1/64 create host-interface name vpp1_rtr set int state host-vpp1_rtr up set int ip address host-vpp1_rtr 6.0.3.1/24 - -lisp enable -lisp map-resolver add 6.0.3.100 - -lisp locator-set add ls1 iface host-vpp1_rtr p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:2::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-vpp1_rtr p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:2::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.vat new file mode 100644 index 0000000..7b477fe --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.vat @@ -0,0 +1,12 @@ +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 locator-set ls1 iface host-vpp1_rtr p 1 w 1 +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_locator_set locator-set ls2 +lisp_add_del_locator locator-set ls2 iface host-vpp1_rtr p 1 w 1 +lisp_eid_table_add_del_map vni 200 vrf 200 +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/rtr_two_iface_two_customers/6o46/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.config index 8f7966c..4eaa9e7 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.config @@ -11,14 +11,3 @@ set int ip address host-vpp2_cus2 6:0:4::1/64 create host-interface name vpp2_rtr set int state host-vpp2_rtr up set int ip address host-vpp2_rtr 6:0:5::1/64 - -lisp enable -lisp map-resolver add 6:0:5::100 - -lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1 -lisp eid-table map vni 100 vrf 100 -lisp eid-table add vni 100 eid 6:0:4::0/64 locator-set ls1 - -lisp locator-set add ls2 iface host-vpp2_rtr p 1 w 1 -lisp eid-table map vni 200 vrf 200 -lisp eid-table add vni 200 eid 6:0:4::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.vat new file mode 100644 index 0000000..0dbd8cf --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.vat @@ -0,0 +1,12 @@ +lisp_enable_disable enable +lisp_add_del_map_resolver 6:0:5::100 + +lisp_add_del_locator_set locator-set ls1 +lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1 +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_locator_set locator-set ls2 +lisp_add_del_locator locator-set ls2 iface host-vpp2_rtr p 1 w 1 +lisp_eid_table_add_del_map vni 200 vrf 200 +lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.vat new file mode 100644 index 0000000..1fc326a --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.vat @@ -0,0 +1,13 @@ +lisp_enable_disable enable + +lisp_add_del_locator_set locator-set ls1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp1 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 +lisp_eid_table_add_del_map vni 100 vrf 100 +lisp_eid_table_add_del_map vni 200 vrf 200 + +lisp_add_del_remote_mapping add vni 100 deid 6:0:0::0/32 action 2 +lisp_add_del_remote_mapping add vni 200 deid 6:0:0::0/32 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config index 59259e4..07867ac 100644 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config @@ -5,11 +5,3 @@ set int ip address host-rtr_wan4 6.0.3.2/24 create host-interface name rtr_vpp2 set int state host-rtr_vpp2 up set int ip address host-rtr_vpp2 6:0:5::2/64 - -lisp enable - -lisp locator-set add ls1 iface host-rtr_wan4 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 -lisp pitr ls ls1 -comment { lisp pitr disable } -lisp remote-mapping eid 6:0:0::0/32 action send-map-request -lisp map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config index 2fe4b62..c36f223 100644 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config @@ -4,9 +4,3 @@ set int ip address host-vpp1 6:0:2::1/64 create host-interface name vpp1_wan4 set int state host-vpp1_wan4 up set int ip address host-vpp1_wan4 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-vpp1_wan4 p 1 w 1 -lisp eid-table add eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat new file mode 100644 index 0000000..72d41e1 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/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-vpp1_wan4 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/smr_rtr_disjoint/vpp2.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config index 71f3174..8069507 100644 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config @@ -7,9 +7,3 @@ set int ip address host-vpp2_rtr 6:0:5::1/64 create host-interface name vpp2_wan4 set int state host-vpp2_wan4 up set int ip address host-vpp2_wan4 6.0.3.3/24 - -lisp enable - -lisp map-resolver add 6:0:5::100 -lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1 iface host-vpp2_wan4 p 1 w 1 -lisp eid-table add eid 6:0:4::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat new file mode 100644 index 0000000..304d7b4 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/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-vpp2_wan4 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1 +lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_add_del_map_resolver 6:0:5::100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat new file mode 100644 index 0000000..e38aadf --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat @@ -0,0 +1,10 @@ +lisp_enable_disable enable + +lisp_add_del_locator_set locator-set ls1 +lisp_add_del_locator locator-set ls1 iface host-rtr_wan4 p 1 w 1 +lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 + +lisp_pitr_set_locator_set locator-set ls1 + +lisp_add_del_remote_mapping add deid 6:0:0::0/32 action 2 +lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/vpp_lite_topo/config.sh b/tests/data_plane/vpp_lite_topo/config.sh index 1fa060a..e4c3283 100644 --- a/tests/data_plane/vpp_lite_topo/config.sh +++ b/tests/data_plane/vpp_lite_topo/config.sh @@ -5,6 +5,7 @@ ODL_PORT="8181" # path to vpp executable VPP_LITE_BIN=/vpp/build-root/install-vpp_lite_debug-native/vpp/bin/vpp +VPP_API_TEST=/vpp/build-root/install-vpp_lite_debug-native/vpp-api-test/bin/vpp_api_test # read user config file if exists if [ -f "${HOME}/.onerc" ] ; then @@ -18,6 +19,16 @@ if [ ! -f "${VPP_LITE_BIN}" ] ; then exit 1 fi +if [ ! -f "${VPP_API_TEST}" ] ; then + echo "Error: vpp_api_test not found. Either it's not built or environment \ + variable VPP_API_TEST is not set. You can build vpp_api_test with:" + echo "$ make build-vat" + echo "VPP_API_TEST can be set in config.sh or in ~/.onerc." + echo "Current value:" + echo "VPP_LITE_BIN=${VPP_API_TEST}" + exit 1 +fi + function clean_all { echo "Clearing all VPP instances.." diff --git a/tests/data_plane/vpp_lite_topo/topologies/basic_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/basic_topo.sh index 4a57c58..09b8e24 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/basic_topo.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/basic_topo.sh @@ -95,6 +95,10 @@ function basic_topo_setup exec ${VPP_LITE_CONF}/vpp2.config } \ api-trace { on } api-segment {prefix xtr2} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + if [ "$1" != "no_odl" ] ; then post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} diff --git a/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh b/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh index 3b6fee3..9066a74 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh @@ -102,6 +102,10 @@ function basic_topo_setup exec ${VPP_LITE_CONF}/vpp2.config } \ api-trace { on } api-segment {prefix xtr2} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + if [ "$1" != "no_odl" ] ; then post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} diff --git a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh index 3d493f0..85f2f90 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh @@ -116,6 +116,10 @@ function multihoming_topo_setup exec ${VPP_LITE_CONF}/vpp2.config } \ api-trace { on } api-segment {prefix xtr2} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + if [ "$1" != "no_odl" ] ; then post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} diff --git a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh index bd490c0..308f375 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh @@ -123,6 +123,10 @@ function multihoming_topo_setup exec ${VPP_LITE_CONF}/vpp2.config } \ api-trace { on } api-segment {prefix xtr2} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + if [ "$1" != "no_odl" ] ; then post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh index b6530e7..c740a17 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh @@ -97,6 +97,11 @@ function rtr_single_iface_setup { exec ${VPP_LITE_CONF}/rtr.config } \ api-trace { on } api-segment {prefix rtr} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat + post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} } diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh index 9f5d856..69306bb 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh @@ -129,6 +129,11 @@ function rtr_two_iface_setup { exec ${VPP_LITE_CONF}/rtr.config } \ api-trace { on } api-segment {prefix rtr} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat + post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} } diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh index ac9020d..12ab299 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh @@ -160,6 +160,11 @@ function rtr_two_iface_two_customers_setup { exec ${VPP_LITE_CONF}/rtr.config } \ api-trace { on } api-segment {prefix rtr} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat + post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} post_curl "add-mapping" ${ODL_CONFIG_FILE3} diff --git a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh index 03e1c84..2b50cc9 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh @@ -133,6 +133,11 @@ function smr_rtr_disjoint_setup { exec ${VPP_LITE_CONF}/rtr.config } \ api-trace { on } api-segment {prefix rtr} + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat + post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} } diff --git a/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh index 2f62913..2570087 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh @@ -121,6 +121,10 @@ function two_customers_topo_setup { exec ${VPP_LITE_CONF}/vpp2.config } \ api-trace { on } api-segment { prefix xtr2 } + sleep 2 + ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat + post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} post_curl "add-mapping" ${ODL_CONFIG_FILE3} |