diff options
Diffstat (limited to 'tests/data_plane/configs/vpp_lite_config')
123 files changed, 435 insertions, 917 deletions
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config index c8f8e74..2a00f70 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 +create_host_iface vpp1 6.0.1.1/24 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6.0.1.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat deleted file mode 100644 index 47e2c87..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config index b7a10a9..c2edf63 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.2.1/24 +create_host_iface vpp2 6.0.2.1/24 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat deleted file mode 100644 index b7218f6..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config index 1ed0c91..4927668 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.config @@ -1,9 +1,11 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 -set int ip address host-vpp1 6:0:1::1/64 +create_host_iface vpp1 6:0:1::1/64 +set_if_ip host-vpp1 6.0.1.1/24 +create_host_iface intervpp1 6:0:3::1/64 +set_if_ip host-intervpp1 6.0.3.1/24 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 -set int ip address host-intervpp1 6:0:3::1/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6.0.1.0/24 locator-set ls1 +lisp_local_eid eid 6:0:1::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat deleted file mode 100644 index df5c2a9..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp1.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1 -lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1 - -lisp_add_del_map_resolver 6.0.3.100 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config index 1386b42..3ec3cd5 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.config @@ -1,9 +1,11 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.2.1/24 -set int ip address host-vpp2 6:0:2::1/64 +create_host_iface vpp2 6:0:2::1/64 +set_if_ip host-vpp2 6.0.2.1/24 +create_host_iface intervpp2 6:0:3::2/64 +set_if_ip host-intervpp2 6.0.3.2/24 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 -set int ip address host-intervpp2 6:0:3::2/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat deleted file mode 100644 index 319c1fe..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_and_6o6/vpp2.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1 -lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1 - -lisp_add_del_map_resolver 6.0.3.100 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config index c8f8e74..be9456e 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 +create_host_iface vpp1 6.0.1.1/24 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6.0.1.0/24 locator-set ls1 +lisp_remote_mapping eid 6.0.2.0/24 rloc 6.0.3.2 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat deleted file mode 100644 index f423599..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1 -lisp_add_del_remote_mapping add vni 0 deid 6.0.2.0/24 rloc 6.0.3.2 p 1 w 1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config index b7a10a9..a5e22ce 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.2.1/24 +create_host_iface vpp2 6.0.2.1/24 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_remote_mapping eid 6.0.1.0/24 rloc 6.0.3.1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat deleted file mode 100644 index 8992986..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1 -lisp_add_del_remote_mapping add vni 0 deid 6.0.1.0/24 rloc 6.0.3.1 p 1 w 1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config index 1a8f419..ee2eddb 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 +create_host_iface vpp1 6.0.1.1/24 +create_host_iface intervpp1 6:0:3::1/64 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6:0:3::1/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6.0.1.0/24 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat deleted file mode 100644 index 14d1824..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config index 876534b..2bcdfb7 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.2.1/24 +create_host_iface vpp2 6.0.2.1/24 +create_host_iface intervpp2 6:0:3::2/64 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6:0:3::2/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat deleted file mode 100644 index c12c6a9..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/4o6/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config index 7387d9c..27b0168 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:1::1/64 +create_host_iface vpp1 6:0:1::1/64 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6:0:1::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat deleted file mode 100644 index 78a90d1..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp1.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 - diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config index 6db6f5d..bb1d78d 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:2::1/64 +create_host_iface vpp2 6:0:2::1/64 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat deleted file mode 100644 index 2a42afd..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o4/vpp2.vat +++ /dev/null @@ -1,8 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 - - diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config index 801ae82..7b8c4f1 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:1::1/64 +create_host_iface vpp1 6:0:1::1/64 +create_host_iface intervpp1 6:0:3::1/64 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6:0:3::1/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6:0:1::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat deleted file mode 100644 index 44af4ac..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config index fa97c7d..1ad4db6 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:2::1/64 +create_host_iface vpp2 6:0:2::1/64 +create_host_iface intervpp2 6:0:3::2/64 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6:0:3::2/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat deleted file mode 100644 index 259516c..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config index 801ae82..ac344c9 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:1::1/64 +create_host_iface vpp1 6:0:1::1/64 +create_host_iface intervpp1 6:0:3::1/64 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6:0:3::1/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_local_eid eid 6:0:1::0/64 locator-set ls1 +lisp_remote_mapping eid 6:0:2::0/64 rloc 6:0:3::2 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat deleted file mode 100644 index 7d223d9..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1 -lisp_add_del_remote_mapping add vni 0 deid 6:0:2::0/64 rloc 6:0:3::2 p 1 w 1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config index fa97c7d..8023062 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:2::1/64 +create_host_iface vpp2 6:0:2::1/64 +create_host_iface intervpp2 6:0:3::2/64 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6:0:3::2/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_remote_mapping eid 6:0:1::0/64 rloc 6:0:3::1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat deleted file mode 100644 index 01882ae..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_remote_mapping add vni 0 deid 6:0:1::0/64 rloc 6:0:3::1 p 1 w 1 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config index 598b09b..6825e21 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.config @@ -1,8 +1,9 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 -set interface l2 bridge host-vpp1 10 +create_host_iface vpp1 6.0.1.1/24 +set_if_l2_bridge host-vpp1 10 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat deleted file mode 100644 index 4b95384..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp1.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_eid_table_add_del_map vni 10 bd_index 10 -lisp_add_del_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config index 76c1d0c..d23c11e 100644 --- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.config @@ -1,8 +1,9 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.1.2/24 -set interface l2 bridge host-vpp2 10 +create_host_iface vpp2 6.0.1.2/24 +set_if_l2_bridge host-vpp2 10 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat deleted file mode 100644 index 55a24c0..0000000 --- a/tests/data_plane/configs/vpp_lite_config/basic/l2o4/vpp2.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_eid_table_add_del_map vni 10 bd_index 10 -lisp_add_del_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 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 58d3133..269290c 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 @@ -1,13 +1,11 @@ -create host-interface name vpp1_cus1 -set int state host-vpp1_cus1 up -set interface ip table host-vpp1_cus1 100 -set int ip address host-vpp1_cus1 6.0.2.1/24 +create_host_iface_vrf vpp1_cus1 6.0.2.1/24 100 +create_host_iface_vrf vpp1_cus2 6.0.2.1/24 200 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name vpp1_cus2 -set int state host-vpp1_cus2 up -set interface ip table host-vpp1_cus2 200 -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_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.2.0/24 locator-set ls1 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 deleted file mode 100644 index 071bd31..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.2.0/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 db01d3f..ae70864 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 @@ -1,13 +1,11 @@ -create host-interface name vpp2_cus1 -set int state host-vpp2_cus1 up -set interface ip table host-vpp2_cus1 100 -set int ip address host-vpp2_cus1 6.0.4.1/24 +create_host_iface_vrf vpp2_cus1 6.0.4.1/24 100 +create_host_iface_vrf vpp2_cus2 6.0.4.1/24 200 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name vpp2_cus2 -set int state host-vpp2_cus2 up -set interface ip table host-vpp2_cus2 200 -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_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.4.0/24 locator-set ls1 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 deleted file mode 100644 index dd01932..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.4.0/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 f657fa9..550f472 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 @@ -1,13 +1,11 @@ -create host-interface name vpp1_cus1 -set int state host-vpp1_cus1 up -set interface ip table host-vpp1_cus1 100 -set int ip address host-vpp1_cus1 6.0.2.1/24 +create_host_iface_vrf vpp1_cus1 6.0.2.1/24 100 +create_host_iface_vrf vpp1_cus2 6.0.2.1/24 200 +create_host_iface intervpp1 6:0:3::1/64 -create host-interface name vpp1_cus2 -set int state host-vpp1_cus2 up -set interface ip table host-vpp1_cus2 200 -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_state enable +lisp_map_resolver 6:0:3::100 +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.2.0/24 locator-set ls1 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 deleted file mode 100644 index 60e66a2..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.vat +++ /dev/null @@ -1,15 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6:0:3::100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.2.0/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.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config index d16f315..a2c09c1 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config @@ -1,24 +1,11 @@ -create host-interface name vpp2_cus1 -set int state host-vpp2_cus1 up -set interface ip table host-vpp2_cus1 100 -set int ip address host-vpp2_cus1 6.0.4.1/24 - -create host-interface name vpp2_cus2 -set int state host-vpp2_cus2 up -set interface ip table host-vpp2_cus2 200 -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/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/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 +create_host_iface_vrf vpp2_cus1 6.0.4.1/24 100 +create_host_iface_vrf vpp2_cus2 6.0.4.1/24 200 +create_host_iface intervpp2 6:0:3::2/64 + +lisp_state enable +lisp_map_resolver 6:0:3::100 +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.4.0/24 locator-set ls1 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 deleted file mode 100644 index 8316d5f..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6:0:3::100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.4.0/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 fb877ba..bbadffe 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 @@ -1,13 +1,11 @@ -create host-interface name vpp1_cus1 -set int state host-vpp1_cus1 up -set interface ip6 table host-vpp1_cus1 100 -set int ip address host-vpp1_cus1 6:0:2::1/64 +create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100 +create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200 +create_host_iface intervpp1 6.0.3.1/24 -create host-interface name vpp1_cus2 -set int state host-vpp1_cus2 up -set interface ip6 table host-vpp1_cus2 200 -set int ip address host-vpp1_cus2 6:0:2::1/64 - -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6.0.3.1/24 +lisp_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1 +lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat deleted file mode 100644 index b6074ce..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config index 7248cf0..3850b03 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 @@ -1,13 +1,11 @@ -create host-interface name vpp2_cus1 -set int state host-vpp2_cus1 up -set interface ip6 table host-vpp2_cus1 100 -set int ip address host-vpp2_cus1 6:0:4::1/64 +create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100 +create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200 +create_host_iface intervpp2 6.0.3.2/24 -create host-interface name vpp2_cus2 -set int state host-vpp2_cus2 up -set interface ip6 table host-vpp2_cus2 200 -set int ip address host-vpp2_cus2 6:0:4::1/64 - -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6.0.3.2/24 +lisp_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1 +lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat deleted file mode 100644 index 12ee36d..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1 -lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config index 60a6e36..5fa5a59 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config @@ -1,13 +1,11 @@ -create host-interface name vpp1_cus1 -set int state host-vpp1_cus1 up -set interface ip6 table host-vpp1_cus1 100 -set int ip address host-vpp1_cus1 6:0:2::1/64 +create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100 +create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200 +create_host_iface intervpp1 6:0:3::1/64 -create host-interface name vpp1_cus2 -set int state host-vpp1_cus2 up -set interface ip6 table host-vpp1_cus2 200 -set int ip address host-vpp1_cus2 6:0:2::1/64 - -create host-interface name intervpp1 -set int state host-intervpp1 up -set int ip address host-intervpp1 6:0:3::1/64 +lisp_state enable +lisp_map_resolver 6:0:3::100 +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1 +lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat deleted file mode 100644 index d329837..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6:0:3::100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config index 43e0727..8d18c31 100644 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config @@ -1,13 +1,11 @@ -create host-interface name vpp2_cus1 -set int state host-vpp2_cus1 up -set interface ip6 table host-vpp2_cus1 100 -set int ip address host-vpp2_cus1 6:0:4::1/64 +create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100 +create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200 +create_host_iface intervpp2 6:0:3::2/64 -create host-interface name vpp2_cus2 -set int state host-vpp2_cus2 up -set interface ip6 table host-vpp2_cus2 200 -set int ip address host-vpp2_cus2 6:0:4::1/64 - -create host-interface name intervpp2 -set int state host-intervpp2 up -set int ip address host-intervpp2 6:0:3::2/64 +lisp_state enable +lisp_map_resolver 6:0:3::100 +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1 +lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat deleted file mode 100644 index e25650c..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.vat +++ /dev/null @@ -1,14 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6:0:3::100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1 -lisp_add_del_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2 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 2258354..0219e63 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 @@ -1,11 +1,8 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 +create_host_iface vpp1 6.0.1.1/24 +create_host_iface intervpp11 6.0.3.1/24 +create_host_iface intervpp21 6.0.4.1/24 -create host-interface name intervpp11 -set int state host-intervpp11 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1 +lisp_local_eid eid 6.0.1.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.vat deleted file mode 100644 index e14f78f..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 27424e2..64a253a 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 @@ -1,11 +1,8 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.2.1/24 +create_host_iface vpp2 6.0.2.1/24 +create_host_iface intervpp12 6.0.3.2/24 +create_host_iface intervpp22 6.0.4.2/24 -create host-interface name intervpp12 -set int state host-intervpp12 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.vat deleted file mode 100644 index dd19c64..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 e9b2d21..2b87436 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 @@ -1,11 +1,8 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:1::1/64 +create_host_iface vpp1 6:0:1::1/64 +create_host_iface intervpp11 6:0:3::1/64 +create_host_iface intervpp21 6:0:4::1/64 -create host-interface name intervpp11 -set int state host-intervpp11 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1 +lisp_local_eid eid 6:0:1::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.vat deleted file mode 100644 index 4bac9cd..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 df27bf5..9af21c2 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 @@ -1,11 +1,8 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:2::1/64 +create_host_iface vpp2 6:0:2::1/64 +create_host_iface intervpp12 6:0:3::2/64 +create_host_iface intervpp22 6:0:4::2/64 -create host-interface name intervpp12 -set int state host-intervpp12 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.vat deleted file mode 100644 index 365524a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 55a2627..0ab9f49 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,12 +1,10 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 -set interface l2 bridge host-vpp1 10 +create_host_iface vpp1 6.0.1.1/24 +set_if_l2_bridge host-vpp1 10 +create_host_iface intervpp11 6.0.3.1/24 +create_host_iface intervpp21 6.0.4.1/24 -create host-interface name intervpp11 -set int state host-intervpp11 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat deleted file mode 100644 index 974f594..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator 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 8f13e84..f3384cb 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,12 +1,10 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.1.2/24 -set interface l2 bridge host-vpp2 10 +create_host_iface vpp2 6.0.1.2/24 +set_if_l2_bridge host-vpp2 10 +create_host_iface intervpp12 6.0.3.2/24 +create_host_iface intervpp22 6.0.4.2/24 -create host-interface name intervpp12 -set int state host-intervpp12 up -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_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat deleted file mode 100644 index 9ded228..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator 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 deleted file mode 100644 index 7fd2b6f..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config +++ /dev/null @@ -1,3 +0,0 @@ -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 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 0c79fdd..c7c062c 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 @@ -1,6 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -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 +create_host_iface vpp1 6.0.2.1/24 +create_host_iface xtr_rtr1 6.0.3.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.vat deleted file mode 100644 index 68286c5..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 f229519..7a086e4 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 @@ -1,6 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -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 +create_host_iface vpp2 6.0.4.1/24 +create_host_iface xtr_rtr3 6.0.3.2/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1 +lisp_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 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 deleted file mode 100644 index a84f369..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config new file mode 100644 index 0000000..62f823c --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config @@ -0,0 +1,7 @@ +create_host_iface xtr_rtr2 6.0.3.3/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6.0.0.0/16 action send-map-request +lisp_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 deleted file mode 100644 index 8a87b93..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.vat +++ /dev/null @@ -1,8 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index 3a80443..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config +++ /dev/null @@ -1,3 +0,0 @@ -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 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 0e45e0f..6d2871c 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 @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.2.1/24 +create_host_iface vpp1 6.0.2.1/24 +create_host_iface xtr_rtr1 6:0:3::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_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.vat deleted file mode 100644 index 6c14003..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 8ec52e3..3705d92 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 @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.4.1/24 +create_host_iface vpp2 6.0.4.1/24 +create_host_iface xtr_rtr3 6:0:3::2/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/64 +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1 +lisp_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_map_resolver 6:0:3::100 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 deleted file mode 100644 index 3ae8819..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config new file mode 100644 index 0000000..57401c7 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config @@ -0,0 +1,7 @@ +create_host_iface xtr_rtr2 6:0:3::3/64 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6.0.0.0/16 action send-map-request +lisp_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 deleted file mode 100644 index c65ecf6..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.vat +++ /dev/null @@ -1,8 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index 7fd2b6f..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config +++ /dev/null @@ -1,3 +0,0 @@ -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 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 32089a2..46a3c98 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 @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:2::1/64 +create_host_iface vpp1 6:0:2::1/64 +create_host_iface xtr_rtr1 6.0.3.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_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat deleted file mode 100644 index 097cc6b..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 97a15c4..240993a 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 @@ -1,7 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:4::1/64 +create_host_iface vpp2 6:0:4::1/64 +create_host_iface xtr_rtr3 6.0.3.2/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_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1 +lisp_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 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 deleted file mode 100644 index ff1db3a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config new file mode 100644 index 0000000..48c6ecb --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config @@ -0,0 +1,7 @@ +create_host_iface xtr_rtr2 6.0.3.3/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6:0:0::0/32 action send-map-request +lisp_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 deleted file mode 100644 index 4feb7b8..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.vat +++ /dev/null @@ -1,8 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index 3a80443..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config +++ /dev/null @@ -1,3 +0,0 @@ -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 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 5618763..450528e 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 @@ -1,7 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6:0:2::1/64 +create_host_iface vpp1 6:0:2::1/64 +create_host_iface xtr_rtr1 6:0:3::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_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.vat deleted file mode 100644 index dce8ef8..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config index 9def44c..5aa0973 100644 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config @@ -1,13 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6:0:4::1/64 +create_host_iface vpp2 6:0:4::1/64 +create_host_iface xtr_rtr3 6:0:3::2/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/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/64 locator-set ls1 +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1 +lisp_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_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 deleted file mode 100644 index 72507fa..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config new file mode 100644 index 0000000..89cbe7e --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config @@ -0,0 +1,7 @@ +create_host_iface xtr_rtr2 6:0:3::3/64 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6:0:0::0/32 action send-map-request +lisp_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 deleted file mode 100644 index bc7259a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.vat +++ /dev/null @@ -1,8 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index a4a481e..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_vpp1 -set int state host-rtr_vpp1 up -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 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 066d34e..3355c13 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 @@ -1,6 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -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 +create_host_iface vpp1 6.0.2.1/24 +create_host_iface vpp1_rtr 6.0.3.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.vat deleted file mode 100644 index d4ca711..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 26b7e7a..1c16cdd 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 @@ -1,6 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -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 +create_host_iface vpp2 6.0.4.1/24 +create_host_iface vpp2_rtr 6.0.5.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1 +lisp_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_map_resolver 6.0.5.100 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 deleted file mode 100644 index 3262c09..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.config new file mode 100644 index 0000000..56749b1 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.config @@ -0,0 +1,8 @@ +create_host_iface rtr_vpp1 6.0.3.2/24 +create_host_iface rtr_vpp2 6.0.5.2/24 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6.0.0.0/16 action send-map-request +lisp_map_resolver 6.0.3.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 deleted file mode 100644 index ecb238a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp3.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index a70a2c9..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_vpp1 -set int state host-rtr_vpp1 up -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 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 449cd58..06f1532 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 @@ -1,6 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -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 +create_host_iface vpp1 6.0.2.1/24 +create_host_iface vpp1_rtr 6:0:3::1/64 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1 +lisp_local_eid eid 6.0.2.0/24 locator-set ls1 +lisp_map_resolver 6:0:3::100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.vat deleted file mode 100644 index 2948ec8..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 efff7b3..f917008 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 @@ -1,6 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -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 +create_host_iface vpp2 6.0.4.1/24 +create_host_iface vpp2_rtr 6:0:5::1/64 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1 +lisp_local_eid eid 6.0.4.0/24 locator-set ls1 +lisp_map_resolver 6:0:5::100 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 deleted file mode 100644 index 8aa96ca..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.config new file mode 100644 index 0000000..873ce1c --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.config @@ -0,0 +1,8 @@ +create_host_iface rtr_vpp1 6:0:3::2/64 +create_host_iface rtr_vpp2 6:0:5::2/64 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6.0.0.0/16 action send-map-request +lisp_map_resolver 6:0:3::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 deleted file mode 100644 index 02794af..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index 03614b5..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_vpp1 -set int state host-rtr_vpp1 up -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 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 24a23b5..216226a 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 @@ -1,6 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -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 +create_host_iface vpp1 6:0:2::1/64 +create_host_iface vpp1_rtr 6.0.3.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.vat deleted file mode 100644 index a01f7a8..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 8a5fe7f..668a9b6 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 @@ -1,6 +1,7 @@ -create host-interface name vpp2 -set int state host-vpp2 up -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 +create_host_iface vpp2 6:0:4::1/64 +create_host_iface vpp2_rtr 6:0:5::1/64 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1 +lisp_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_map_resolver 6:0:5::100 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 deleted file mode 100644 index 134b24f..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.config new file mode 100644 index 0000000..d565b02 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.config @@ -0,0 +1,8 @@ +create_host_iface rtr_vpp1 6.0.3.2/24 +create_host_iface rtr_vpp2 6:0:5::2/64 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6:0:0::0/32 action send-map-request +lisp_map_resolver 6.0.3.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 deleted file mode 100644 index 06a522a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.vat +++ /dev/null @@ -1,9 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 deleted file mode 100644 index 03614b5..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_vpp1 -set int state host-rtr_vpp1 up -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 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 5b5452e..2b80070 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 @@ -1,13 +1,12 @@ -create host-interface name vpp1_cus1 -set int state host-vpp1_cus1 up -set interface ip6 table host-vpp1_cus1 100 -set int ip address host-vpp1_cus1 6:0:2::1/64 +create_host_iface_vrf_v6 vpp1_cus1 6:0:2::1/64 100 +create_host_iface_vrf_v6 vpp1_cus2 6:0:2::1/64 200 +create_host_iface vpp1_rtr 6.0.3.1/24 -create host-interface name vpp1_cus2 -set int state host-vpp1_cus2 up -set interface ip6 table host-vpp1_cus2 200 -set int ip address host-vpp1_cus2 6:0:2::1/64 - -create host-interface name vpp1_rtr -set int state host-vpp1_rtr up -set int ip address host-vpp1_rtr 6.0.3.1/24 +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_rtr 1 1 +lisp_eid_map_vrf 100 100 +lisp_local_eid vni 100 eid 6:0:2::0/64 locator-set ls1 +lisp_locator_set_with_locator ls2 host-vpp1_rtr 1 1 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 200 eid 6:0:2::0/64 locator-set ls2 +lisp_map_resolver 6.0.3.100 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 deleted file mode 100644 index 7b477fe..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.vat +++ /dev/null @@ -1,12 +0,0 @@ -lisp_enable_disable enable -lisp_add_del_map_resolver 6.0.3.100 - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator 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 4eaa9e7..50400e2 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 @@ -1,13 +1,12 @@ -create host-interface name vpp2_cus1 -set int state host-vpp2_cus1 up -set interface ip6 table host-vpp2_cus1 100 -set int ip address host-vpp2_cus1 6:0:4::1/64 +create_host_iface_vrf_v6 vpp2_cus1 6:0:4::1/64 100 +create_host_iface_vrf_v6 vpp2_cus2 6:0:4::1/64 200 +create_host_iface vpp2_rtr 6:0:5::1/64 -create host-interface name vpp2_cus2 -set interface ip6 table host-vpp2_cus2 200 -set int state host-vpp2_cus2 up -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_state enable +lisp_locator_set_with_locator ls1 host-vpp2_rtr 1 1 +lisp_eid_map_vrf 100 100 +lisp_local_eid vni 100 eid 6:0:4::0/64 locator-set ls1 +lisp_locator_set_with_locator ls2 host-vpp2_rtr 1 1 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 200 eid 6:0:4::0/64 locator-set ls2 +lisp_map_resolver 6:0:5::100 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 deleted file mode 100644 index 0dbd8cf..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.vat +++ /dev/null @@ -1,12 +0,0 @@ -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.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.config new file mode 100644 index 0000000..97f9817 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.config @@ -0,0 +1,11 @@ +create_host_iface rtr_vpp1 6.0.3.2/24 +create_host_iface rtr_vpp2 6:0:5::2/64 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 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 +lisp_map_resolver 6.0.3.100 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 deleted file mode 100644 index 1fc326a..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp3.vat +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 07867ac..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_wan4 -set int state host-rtr_wan4 up -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 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 c36f223..a7c0eca 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 @@ -1,6 +1,7 @@ -create host-interface name vpp1 -set int state host-vpp1 up -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 +create_host_iface vpp1 6:0:2::1/64 +create_host_iface vpp1_wan4 6.0.3.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_wan4 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat deleted file mode 100644 index 72d41e1..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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 8069507..794ff84 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 @@ -1,9 +1,8 @@ -create host-interface name vpp2 -set int state host-vpp2 up -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 -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 +create_host_iface vpp2 6:0:4::1/64 +create_host_iface vpp2_rtr 6:0:5::1/64 +create_host_iface vpp2_wan4 6.0.3.3/24 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-vpp2_rtr p 1 w 1 iface host-vpp2_wan4 p 1 w 1 +lisp_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 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 deleted file mode 100644 index 304d7b4..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-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.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config new file mode 100644 index 0000000..b87a7d0 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config @@ -0,0 +1,8 @@ +create_host_iface rtr_wan4 6.0.3.2/24 +create_host_iface rtr_vpp2 6:0:5::2/64 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_wan4 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6:0:0::0/32 action send-map-request +lisp_map_resolver 6.0.3.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 deleted file mode 100644 index e38aadf..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat +++ /dev/null @@ -1,10 +0,0 @@ -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 |