Update adjacency tests

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

diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp1.config
index b348b11..54d8448 100644 (file)
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp1.config
@@ -5,4 +5,4 @@ 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
-lisp_adjacency seid 6.0.1.0/24 deid 6.0.2.0/24
+lisp_adjacency leid 6.0.1.0/24 reid 6.0.2.0/24

diff --git a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp2.config
index 264d9ca..abdbfa8 100644 (file)
--- a/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/4o4_no_odl_adj/vpp2.config
@@ -5,4 +5,4 @@ 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
-lisp_adjacency seid 6.0.2.0/24 deid 6.0.1.0/24
+lisp_adjacency leid 6.0.2.0/24 reid 6.0.1.0/24

diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp1.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp1.config
index 22cb8fb..84a9985 100644 (file)
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp1.config
@@ -5,4 +5,4 @@ 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
-lisp_adjacency seid 6:0:1::0/64 deid 6:0:2::0/64
+lisp_adjacency leid 6:0:1::0/64 reid 6:0:2::0/64

diff --git a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp2.config b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp2.config
index 72829af..0978f5a 100644 (file)
--- a/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/basic/6o6_no_odl_adj/vpp2.config
@@ -5,4 +5,4 @@ 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
-lisp_adjacency deid 6:0:1::0/64 seid 6:0:2::0/64
+lisp_adjacency reid 6:0:1::0/64 leid 6:0:2::0/64

diff --git a/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh
index eafa09e..9e8cf6d 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh
@@ -26,9 +26,11 @@ function set_arp
 
   mac=`echo "sh hard host-intervpp1" | nc 0 5002 | grep 'Ethernet address' | awk '{print $3}'`
   echo "set ip arp host-intervpp2 6.0.3.1 $mac" | nc 0 5003
+  echo "set ip6 neighbor host-intervpp2 6:0:3::1 $mac" | nc 0 5003
 
   mac=`echo "sh hard host-intervpp2" | nc 0 5003 | grep 'Ethernet address' | awk '{print $3}'`
   echo "set ip arp host-intervpp1 6.0.3.2 $mac" | nc 0 5002
+  echo "set ip6 neighbor host-intervpp1 6:0:3::2 $mac" | nc 0 5002
 }
 
 function 2_node_topo_clean
@@ -119,12 +121,12 @@ function 2_node_topo_setup
   start_vpp 5002 vpp1
   start_vpp 5003 vpp2
 
+  sleep 2
   echo "* Selected configuration method: $CFG_METHOD"
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
   else