From: Lori Jakab Date: Thu, 11 Aug 2016 18:18:53 +0000 (+0000) Subject: Merge "Add multihoming tests" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4cf0fc0cc463e294eab3f727d811e2a11ecadcae;hp=76ab005261dba3fd5bec32df2ad253e4185116f0;p=one.git Merge "Add multihoming tests" --- diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh index d678e9e..77e3d14 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh @@ -43,8 +43,8 @@ function test_basic # change IP addresses of destination RLOC 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 "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 "set int ip address del host-intervpp2 6:0:3::2/64" | nc 0 5003 + echo "set int ip address host-intervpp2 6:0:3::20/64" | nc 0 5003 post_curl "update-mapping" ${ODL_CONFIG_FILE3} ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}" diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh index 3af8bfa..1dc8ae0 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh @@ -48,8 +48,8 @@ function test_basic_multi_traffic # change IP addresses of destination RLOC 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 "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 "set int ip address del host-intervpp2 6:0:3::2/64" | nc 0 5003 + echo "set int ip address host-intervpp2 6:0:3::20/64" | nc 0 5003 ODL_CONFIG_DIR=`pwd`/../configs/odl/basic/6o6 post_curl "update-mapping" ${ODL_CONFIG_FILE3} 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 f7fa31c..9df6ebb 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 @@ -32,11 +32,13 @@ function test_basic_no_odl # change IP addresses of destination RLOC 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 "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 "set int ip address del host-intervpp2 6:0:3::2/64" | nc 0 5003 + echo "set int ip address host-intervpp2 6:0:3::20/64" | nc 0 5003 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 + echo "lisp remote-mapping del vni 0 eid 6:0:2::0/64 rloc 6:0:3::2" | nc 0 5002 + echo "lisp remote-mapping add vni 0 eid 6:0:2::0/64 rloc 6:0:3::20" | nc 0 5002 ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}" rc=$?