projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid using printheader
[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
be69d3f
..
677b673
100755
(executable)
--- a/
utils/ci/check_manual_usage_example.sh
+++ b/
utils/ci/check_manual_usage_example.sh
@@
-21,9
+21,14
@@
W() {
sleep 0.5s
done
EOF
sleep 0.5s
done
EOF
- timeout -k 3s ${T} ${SUBF} "${1}"
-
local
RES=$?
+ local RES=0
+
timeout -k 3s ${T} ${SUBF} "${1}" ||
RES=$?
rm -f ${SUBF}
rm -f ${SUBF}
+ if [ ! "$RES" = "0" ]; then
+ sync
+ echo "(Debug) Error while waiting for a pattern to appear in screenlog.0"
+ strings screenlog.0
+ fi
return ${RES}
}
return ${RES}
}
@@
-39,18
+44,24
@@
if ! screen --version | grep 'Screen version'; then
sudo apt-get install -y screen
screen --version | grep 'Screen version'
fi
sudo apt-get install -y screen
screen --version | grep 'Screen version'
fi
+if ! timeout --version; then
+ # Install coreutils for the timeout command
+ sudo apt-get update -qq -y
+ sudo apt-get install -y coreutils
+ timeout --version
+fi
# Initial cleanup
# Initial cleanup
-pkill
'screen
' || true
+pkill
-f 'SCREEN -L -S sonemu
' || true
screen -wipe || true
rm -f screenlog.0
# Start containernet with a topology
screen -wipe || true
rm -f screenlog.0
# 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
@@
-59,19
+70,20
@@
son-emu-cli compute start -d datacenter1 -n vnf1 && sleep 1s
son-emu-cli compute start -d datacenter1 -n vnf2 && sleep 1s
# List compute nodes
son-emu-cli compute list && sleep 1s
son-emu-cli compute start -d datacenter1 -n vnf2 && sleep 1s
# List compute nodes
son-emu-cli compute list && sleep 1s
+sync # avoid text overlapping
# Gather some infos
# Gather some infos
-Cmd 'sh
echo "
... starting various checks"'
-sync # avoid te
s
t overlapping
-Cmd 'vnf1 ifconfig &&
echo "
... checked vnf1"'
+Cmd 'sh
sync && echo -e "\n
... starting various checks"'
+sync # avoid te
x
t overlapping
+Cmd 'vnf1 ifconfig &&
sync && echo -e "\n
... checked vnf1"'
W "^... checked vnf1"
W "^... checked vnf1"
-Cmd 'vnf2 ifconfig &&
echo "
... checked vnf2"'
+Cmd 'vnf2 ifconfig &&
sync && echo -e "\n
... checked vnf2"'
W "^... checked vnf2"
# Try to ping vnfs
W "^... checked vnf2"
# Try to ping vnfs
-Cmd 'vnf1 ping -c 2 vnf2
|| echo "
... checked ping"'
+Cmd 'vnf1 ping -c 2 vnf2
&& sync && echo -e "\n
... checked ping"'
W "^... checked ping" 20s
Cmd 'quit'
# Wait for sonemu to end
W "^... checked ping" 20s
Cmd 'quit'
# Wait for sonemu to end
-W '
^
*** Done'
+W '*** Done'
echo -e '\n\n******************* Result ******************\n\n'
strings screenlog.0
echo -e '\n\n******************* Result ******************\n\n'
strings screenlog.0