From: stevenvanrossem Date: Tue, 28 Jun 2016 10:02:02 +0000 (+0200) Subject: modify ci test X-Git-Tag: v3.1~110^2~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=050c26162145a4884d31fe4c214011a2208b8ced;p=osm%2Fvim-emu.git modify ci test --- diff --git a/utils/ci/stop_sdk_monitor.sh b/utils/ci/stop_sdk_monitor.sh new file mode 100755 index 0000000..b162f20 --- /dev/null +++ b/utils/ci/stop_sdk_monitor.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# stop the monitor +son-emu-cli monitor stop_metric -vnf vnf1:output --metric tx_packets + +sleep 1 + +#stop the vnf +son-emu-cli compute-zapi stop -d datacenter1 -n vnf1 + + diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh index 51e5e7a..3c88176 100755 --- a/utils/ci/test_sdk_monitor.sh +++ b/utils/ci/test_sdk_monitor.sh @@ -5,7 +5,7 @@ #python src/emuvim/examples/monitoring_demo_topology.py & # start a vnf -son-emu-cli compute start -d datacenter1 -n vnf1 --net '(id=input,ip=10.0.10.3/24),(id=output,ip=10.0.10.4/24)' +son-emu-cli compute-zapi start -d datacenter1 -n vnf1 --net '(id=input,ip=10.0.10.3/24),(id=output,ip=10.0.10.4/24)' sleep 1 @@ -19,13 +19,6 @@ cpu_load=$(son-emu-cli monitor prometheus -d datacenter1 -vnf vnf1 -q 'sum(rate( sleep 1 -# stop the monitor -son-emu-cli monitor stop_metric -vnf vnf1:output --metric tx_packets - -sleep 1 - -#stop the vnf -son-emu-cli compute stop -d datacenter1 -n vnf1 # test if prometheus query worked echo $cpu_load