Fix vpp_lite tests that use remote mapping CLI

Change-Id: I5b39bcfb58f7d580e76093075dae6c607e8ac34a
Signed-off-by: Florin Coras <fcoras@cisco.com>

13 files changed, 12 insertions, 18 deletions

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 f6588c9..681e426 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
@@ -10,4 +10,4 @@ lisp enable
 
 lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
 lisp eid-table add eid 6.0.1.0/24 locator-set ls1
-lisp remote-mapping add vni 0 deid 6.0.2.0/24 seid 6.0.1.0/24 rloc 6.0.3.2
+lisp remote-mapping add vni 0 eid 6.0.2.0/24 rloc 6.0.3.2
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl/vpp2.config
index 5361325..f0fb6f0 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
@@ -10,4 +10,4 @@ lisp enable
 
 lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
 lisp eid-table add eid 6.0.2.0/24 locator-set ls1
-lisp remote-mapping add vni 0 deid 6.0.1.0/24 seid 6.0.2.0/24 rloc 6.0.3.1
+lisp remote-mapping add vni 0 eid 6.0.1.0/24 rloc 6.0.3.1
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp1.config
index 4a45cec..91bd1ef 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
@@ -10,4 +10,4 @@ lisp enable
 
 lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
 lisp eid-table add eid 6:0:1::0/64 locator-set ls1
-lisp remote-mapping add vni 0 deid 6:0:2::0/64 seid 6:0:1::0/64 rloc 6:0:3::2
+lisp remote-mapping add vni 0 eid 6:0:2::0/64 rloc 6:0:3::2
diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl/vpp2.config
index ec4bb6d..8552e28 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
@@ -10,4 +10,4 @@ lisp enable
 
 lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
 lisp eid-table add eid 6:0:2::0/64 locator-set ls1
-lisp remote-mapping add vni 0 deid 6:0:1::0/64 seid 6:0:2::0/64 rloc 6:0:3::1
+lisp remote-mapping add vni 0 eid 6:0:1::0/64 rloc 6:0:3::1
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config
index 7c603ec..fafb06c 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/rtr.config
@@ -5,6 +5,5 @@ set int ip address host-xtr_rtr2 6.0.3.3/24
 lisp enable
 lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
 lisp pitr ls ls1
-comment { lisp pitr disable }
-lisp remote-mapping deid 6.0.0.0/16 action send-map-request
+lisp remote-mapping eid 6.0.0.0/16 action send-map-request
 lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config
index 95622c9..8be1be2 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/rtr.config
@@ -5,5 +5,5 @@ set int ip address host-xtr_rtr2 6:0:3::3/64
 lisp enable
 lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
 lisp pitr ls ls1
-lisp remote-mapping deid 6.0.0.0/16 action send-map-request
+lisp remote-mapping eid 6.0.0.0/16 action send-map-request
 lisp map-resolver add 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
index 3dcac84..0e893f5 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
@@ -5,5 +5,5 @@ set int ip address host-xtr_rtr2 6.0.3.3/24
 lisp enable
 lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
 lisp pitr ls ls1
-lisp remote-mapping deid 6:0:0::0/64 action send-map-request
+lisp remote-mapping eid 6:0:0::0/64 action send-map-request
 lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config
index cb9bfa0..081bc2e 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config
@@ -5,5 +5,5 @@ set int ip address host-xtr_rtr2 6:0:3::3/64
 lisp enable
 lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
 lisp pitr ls ls1
-lisp remote-mapping deid 6:0:0::0/64 action send-map-request
+lisp remote-mapping eid 6:0:0::0/64 action send-map-request
 lisp map-resolver add 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config
index 480f3d5..e18129e 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/rtr.config
@@ -10,6 +10,5 @@ lisp enable
 
 lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
 lisp pitr ls ls1
-comment { lisp pitr disable }
-lisp remote-mapping deid 6.0.0.0/16 action send-map-request
+lisp remote-mapping eid 6.0.0.0/16 action send-map-request
 lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o4/vpp1.config
index 6608b9b..4ef387e 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
@@ -11,4 +11,3 @@ lisp map-resolver add 6.0.3.100
 lisp locator-set add ls1 iface host-vpp1_rtr p 1 w 1
 lisp eid-table add eid 6.0.2.0/24 locator-set ls1
 
-comment {ip route add 6.0.5.0/24 via 6.0.3.1}
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 304f011..ff7af94 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
@@ -10,5 +10,3 @@ lisp enable
 lisp map-resolver add 6.0.5.100
 lisp locator-set add ls1 iface host-vpp2_rtr p 1 w 1
 lisp eid-table add eid 6.0.4.0/24 locator-set ls1
-
-comment {ip route add 6.0.3.0/24 via 6.0.5.1}
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config
index 46a9037..07fe676 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/4o6/rtr.config
@@ -10,6 +10,5 @@ lisp enable
 
 lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
 lisp pitr ls ls1
-comment { lisp pitr disable }
-lisp remote-mapping deid 6.0.0.0/16 action send-map-request
+lisp remote-mapping eid 6.0.0.0/16 action send-map-request
 lisp map-resolver add 6:0:3::100
diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic_no_odl.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic_no_odl.sh
index ee0f66d..f7fa31c 100644
--- a/tests/data_plane/vpp_lite_topo/test_driver/basic_no_odl.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/basic_no_odl.sh
@@ -35,8 +35,8 @@ function test_basic_no_odl
   echo "set int ip address del host-intervpp2 6:0:3::2/24" | nc 0 5003
   echo "set int ip address host-intervpp2 6:0:3::20/24" | nc 0 5003
 
-  echo "lisp remote-mapping del vni 0 deid 6.0.2.0/24 seid 6.0.1.0/24 rloc 6.0.3.2" | nc 0 5002
-  echo "lisp remote-mapping add vni 0 deid 6.0.2.0/24 seid 6.0.1.0/24 rloc 6.0.3.20" | nc 0 5002
+  echo "lisp remote-mapping del vni 0 eid 6.0.2.0/24 rloc 6.0.3.2" | nc 0 5002
+  echo "lisp remote-mapping add vni 0 eid 6.0.2.0/24 rloc 6.0.3.20" | nc 0 5002
 
   ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
   rc=$?