projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/sonata-nfv/son-emu
[osm/vim-emu.git]
/
utils
/
ci
/
check_manual_usage_example.sh
diff --git
a/utils/ci/check_manual_usage_example.sh
b/utils/ci/check_manual_usage_example.sh
index
75faf39
..
0c5c32b
100755
(executable)
--- a/
utils/ci/check_manual_usage_example.sh
+++ b/
utils/ci/check_manual_usage_example.sh
@@
-14,7
+14,6
@@
W() {
chmod +x ${SUBF}
cat > ${SUBF} <<- EOF
#!/bin/bash -e
chmod +x ${SUBF}
cat > ${SUBF} <<- EOF
#!/bin/bash -e
- set -x
while true; do
if strings screenlog.0 | grep -m 1 "\${1}"; then
exit 0
while true; do
if strings screenlog.0 | grep -m 1 "\${1}"; then
exit 0
@@
-22,7
+21,6
@@
W() {
sleep 0.5s
done
EOF
sleep 0.5s
done
EOF
- cat ${SUBF}
timeout -k 3s ${T} ${SUBF} "${1}"
local RES=$?
rm -f ${SUBF}
timeout -k 3s ${T} ${SUBF} "${1}"
local RES=$?
rm -f ${SUBF}
@@
-54,11
+52,11
@@
rm -f screenlog.0
# Start containernet with a topology
# Start containernet with a topology
-screen -L -S sonemu -d -m python src/emuvim/examples/simple_topology.py
+screen -L -S sonemu -d -m
sudo
python src/emuvim/examples/simple_topology.py
# Setup screen for immediate flusing
screen -S sonemu -X logfile flush 0
# Wait for the cli to start
# Setup screen for immediate flusing
screen -S sonemu -X logfile flush 0
# Wait for the cli to start
-W '^*** Starting CLI:'
+W '^*** Starting CLI:'
60s
# Print nodes
Cmd 'nodes'
# Start vnf1
# Print nodes
Cmd 'nodes'
# Start vnf1
@@
-69,13
+67,13
@@
son-emu-cli compute start -d datacenter1 -n vnf2 && sleep 1s
son-emu-cli compute list && sleep 1s
# Gather some infos
Cmd 'sh echo "... starting various checks"'
son-emu-cli compute list && sleep 1s
# Gather some infos
Cmd 'sh echo "... starting various checks"'
-sync # avoid te
s
t overlapping
+sync # avoid te
x
t overlapping
Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
W "^... checked vnf1"
Cmd 'vnf2 ifconfig && echo "... checked vnf2"'
W "^... checked vnf2"
# Try to ping vnfs
Cmd 'vnf1 ifconfig && echo "... checked vnf1"'
W "^... checked vnf1"
Cmd 'vnf2 ifconfig && echo "... checked vnf2"'
W "^... checked vnf2"
# Try to ping vnfs
-Cmd 'vnf1 ping -c 2 vnf2
||
echo "... checked ping"'
+Cmd 'vnf1 ping -c 2 vnf2
&&
echo "... checked ping"'
W "^... checked ping" 20s
Cmd 'quit'
# Wait for sonemu to end
W "^... checked ping" 20s
Cmd 'quit'
# Wait for sonemu to end