X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fci%2Ftest_sdk_monitor.sh;h=3c881767cf17065f875fdbc29c3669b50d84b8cc;hp=370ca8062911f0682d5182f3d3ba1184660440c3;hb=050c26162145a4884d31fe4c214011a2208b8ced;hpb=02aa1966ed14f45e0523ea4a665d8ed17cf019d4

diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh
index 370ca80..3c88176 100755
--- a/utils/ci/test_sdk_monitor.sh
+++ b/utils/ci/test_sdk_monitor.sh
@@ -5,7 +5,10 @@
 #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
+
 # monitor a metric
 son-emu-cli monitor setup_metric -vnf vnf1:output --metric tx_packets
 
@@ -14,18 +17,20 @@ sleep 5
 # check if metric is monitored as expected
 cpu_load=$(son-emu-cli monitor prometheus -d datacenter1 -vnf vnf1 -q 'sum(rate(container_cpu_usage_seconds_total{id="/docker/<uuid>"}[10s]))')
 
-# 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
+
+regex='\[[0-9.]*, .*\]'
+
 if [[ $cpu_load =~ $regex ]] ; then
 	echo " cpu monitor test OK"
 	exit 0
 else
-	echo $cpu_load
 	echo "cpu monitor test not OK"
 	exit 1
 fi
+
+