Code Review
/
one.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add adjacency test
[one.git]
/
tests
/
data_plane
/
vpp_lite_topo
/
test_driver
/
basic.sh
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
cd10d4c
..
88753bf
100644
(file)
--- a/
tests/data_plane/vpp_lite_topo/test_driver/basic.sh
+++ b/
tests/data_plane/vpp_lite_topo/test_driver/basic.sh
@@
-1,13
+1,13
@@
source config.sh
source odl_utils.sh
source config.sh
source odl_utils.sh
-source topologies/
basic
_topo.sh
+source topologies/
2_node
_topo.sh
ODL_CONFIG_FILE1="vpp1.json"
ODL_CONFIG_FILE2="vpp2.json"
ODL_CONFIG_FILE3="update_vpp2.json"
if [ "$1" == "clean" ] ; then
ODL_CONFIG_FILE1="vpp1.json"
ODL_CONFIG_FILE2="vpp2.json"
ODL_CONFIG_FILE3="update_vpp2.json"
if [ "$1" == "clean" ] ; then
-
basic
_topo_clean
+
2_node
_topo_clean
exit 0
fi
exit 0
fi
@@
-19,14
+19,14
@@
fi
function test_basic
{
if [ "$3" != "no_setup" ] ; then
function test_basic
{
if [ "$3" != "no_setup" ] ; then
-
basic
_topo_setup
+
2_node
_topo_setup
fi
maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
fi
maybe_pause
test_result=1
ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
- assert_rc_ok $?
basic
_topo_clean "No ICMP response!"
+ assert_rc_ok $?
2_node
_topo_clean "No ICMP response!"
maybe_pause
# change IP addresses of destination RLOC
maybe_pause
# change IP addresses of destination RLOC
@@
-42,7
+42,7
@@
function test_basic
# test done
maybe_pause
# test done
maybe_pause
-
basic
_topo_clean
+
2_node
_topo_clean
print_status $rc "No ICMP response!"
exit $test_result
}
print_status $rc "No ICMP response!"
exit $test_result
}