X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=0c5c32be695e6f67f37767e85a2521cda17b27e8;hp=75faf3968450d63399d84557a8704bf870a1f8e5;hb=b9e768fae8c8c265d28b44ee2110ae748aaa23b9;hpb=7511f6ddaaaed78d65d36b7fce47297e5b4dd7f0 diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh index 75faf39..0c5c32b 100755 --- 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 - set -x while true; do if strings screenlog.0 | grep -m 1 "\${1}"; then exit 0 @@ -22,7 +21,6 @@ W() { sleep 0.5s done EOF - cat ${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 -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 -W '^*** Starting CLI:' +W '^*** Starting CLI:' 60s # 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"' -sync # avoid test overlapping +sync # avoid text 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 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