Update configs for RTR tests due to changes in xTR/PITR/PETR modes

Change-Id: I34cbbabaf2b5b52769e51913033a25440908282a
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

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
index cf1c628..32483c4 100644 (file)
--- 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
@@ -1,6 +1,9 @@
 create_host_iface xtr3 6.0.3.3/24
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 lisp_locator_set_with_locator ls1 host-xtr3 1 1
 lisp_pitr ls1
 lisp_remote_mapping eid 6.0.0.0/16 action send-map-request

diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4_vni/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4_vni/vpp3.config
index 560c8ec..86dc31c 100644 (file)
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4_vni/vpp3.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4_vni/vpp3.config
@@ -1,6 +1,9 @@
 create_host_iface xtr3 6.0.3.3/24
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 lisp_locator_set_with_locator ls1 host-xtr3 1 1
 lisp_pitr ls1
 lisp_eid_map_vrf 100 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
index 07955f3..af784a5 100644 (file)
--- 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
@@ -1,6 +1,9 @@
 create_host_iface xtr3 6:0:3::3/64
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 lisp_locator_set_with_locator ls1 host-xtr3 1 1
 lisp_pitr ls1
 lisp_remote_mapping eid 6.0.0.0/16 action send-map-request

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
index e771f16..6bdcd98 100644 (file)
--- 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
@@ -1,6 +1,9 @@
 create_host_iface xtr3 6.0.3.3/24
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 lisp_locator_set_with_locator ls1 host-xtr3 1 1
 lisp_pitr ls1
 lisp_remote_mapping eid 6:0:0::0/32 action send-map-request

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
index bebd27f..8761135 100644 (file)
--- 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
@@ -1,6 +1,9 @@
 create_host_iface xtr3 6:0:3::3/64
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 lisp_locator_set_with_locator ls1 host-xtr3 1 1
 lisp_pitr ls1
 lisp_remote_mapping eid 6:0:0::0/32 action send-map-request

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
index 56749b1..a911984 100644 (file)
--- 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
@@ -3,6 +3,9 @@ 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_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 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.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/vpp3.config
index 873ce1c..7a0bf09 100644 (file)
--- 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
@@ -4,5 +4,8 @@ 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_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 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/6o46/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp3.config
index d565b02..f28f122 100644 (file)
--- 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
@@ -4,5 +4,8 @@ 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_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode enable
 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.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config
index b87a7d0..7238a11 100644 (file)
--- 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
@@ -2,6 +2,9 @@ create_host_iface rtr_wan4 6.0.3.2/24
 create_host_iface rtr_vpp2 6:0:5::2/64
 
 lisp_state enable
+lisp_xtr_mode disable
+lisp_pitr_mode enable
+lisp_petr_mode 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

diff --git a/tests/data_plane/vpp_lite_topo/scripts/cmd_mappings.py b/tests/data_plane/vpp_lite_topo/scripts/cmd_mappings.py
index 864b486..f19eb1c 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/scripts/cmd_mappings.py
+++ b/tests/data_plane/vpp_lite_topo/scripts/cmd_mappings.py
@@ -56,6 +56,9 @@ SimpleMapping('lisp_map_server', 'one map-server', 'one_add_del_map_server')
 SimpleMapping('lisp_local_eid', 'one eid-table', 'one_add_del_local_eid')
 SimpleMapping('lisp_remote_mapping', 'one remote-mapping', 'one_add_del_remote_mapping')
 SimpleMapping('lisp_pitr', 'one pitr ls', 'one_pitr_set_locator_set locator-set')
+SimpleMapping('lisp_xtr_mode', 'one xtr mode', 'one_enable_disable_xtr_mode')
+SimpleMapping('lisp_petr_mode', 'one petr mode', 'one_enable_disable_petr_mode')
+SimpleMapping('lisp_pitr_mode', 'one pitr mode', 'one_enable_disable_pitr_mode')
 SimpleMapping('lisp_adjacency', 'one adjacency', 'one_add_del_adjacency')
 SimpleMapping('lisp_map_request_mode', 'one map-request mode', 'one_map_request_mode')
 SimpleMapping('set_if_ip', 'set int ip address', 'sw_interface_add_del_address')