diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2016-10-06 13:20:58 +0200 |
|---|---|---|
| committer | Filip Tehlar <ftehlar@cisco.com> | 2016-10-06 14:03:30 +0200 |
| commit | abc6884972bc0792f4817a3822f13128d716c889 (patch) | |
| tree | 343e9a7170c424dd8774d5f57c9123096a7da91f /tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh | |
| parent | 18b298a6096f95362c4f38270166f335790f4d0b (diff) | |
Fix some test issues
* add sleep to v6 eid virt test
* fix failover test
* reuse topology setup at failover test
Change-Id: I7f1234696a9cec7931984c4dcee79c2cf90287d1
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh')
| -rw-r--r-- | tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh | 16 |
1 files changed, 13 insertions, 3 deletions
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 9e8cf6d..c882c0e 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/2_node_topo.sh @@ -5,13 +5,15 @@ # | MR | # | | # +--------+ -# |6.0.3.100 +# odl |6.0.3.100 #6:0:1::2 |6:0:3::100 #6.0.1.2 vpp1 +--------+ | +--------+ # +---------+ |intervpp1 |intervpp2| |vpp2 # | VPP1 +----------+---------+ VPP2 +---------+ -# | | | | 6.0.2.2 -# +--------+ +--------+ 6:0:2::2 +# | | | | | 6.0.2.2 +# +--------+ | +--------+ 6:0:2::2 +# +mr +# 6.0.3.200 # function set_arp @@ -47,6 +49,7 @@ function 2_node_topo_clean ip link del dev veth_intervpp1 &> /dev/null ip link del dev veth_intervpp2 &> /dev/null ip link del dev veth_odl &> /dev/null + ip link del dev veth_mr &> /dev/null ip netns del vppns1 &> /dev/null ip netns del vppns2 &> /dev/null ip netns del intervppns &> /dev/null @@ -68,18 +71,22 @@ function 2_node_topo_setup ip link add veth_intervpp1 type veth peer name intervpp1 ip link add veth_intervpp2 type veth peer name intervpp2 ip link add veth_odl type veth peer name odl + ip link add veth_mr type veth peer name mr ip link set dev intervpp1 up ip link set dev intervpp2 up ip link set dev odl up + ip link set dev mr up ip link set dev veth_intervpp1 up netns intervppns ip link set dev veth_intervpp2 up netns intervppns ip link set dev veth_odl up netns intervppns + ip link set dev veth_mr up netns intervppns # create bridge in intervppns and add vpp and odl interfaces ip netns exec intervppns brctl addbr vppbr ip netns exec intervppns brctl addif vppbr veth_intervpp1 ip netns exec intervppns brctl addif vppbr veth_intervpp2 ip netns exec intervppns brctl addif vppbr veth_odl + ip netns exec intervppns brctl addif vppbr veth_mr ip netns exec intervppns ifconfig vppbr up # create and configure 1st veth client to vpp pair @@ -115,6 +122,9 @@ function 2_node_topo_setup ip addr add 6:0:3::100/64 dev odl ethtool --offload odl rx off tx off + ip addr add 6.0.3.200/24 dev mr + ethtool --offload mr rx off tx off + # generate config files ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD} |