X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fci%2Ftest_sdk_monitor.sh;h=8c3ce4708f8bcd512a668bb16ada61b05fa7ecf4;hp=08e52e54b8076108fec8db2710cc41cdbf2ec489;hb=fe94c7029fe909612427ef92784a80a8c46e7b67;hpb=000237b471e937907309bb767077a95a4eb2af36

diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh
index 08e52e5..8c3ce47 100755
--- a/utils/ci/test_sdk_monitor.sh
+++ b/utils/ci/test_sdk_monitor.sh
@@ -1,22 +1,27 @@
 #!/bin/bash
+set -e
+set -x
+
 # test if a vnf can be deployed and monitored
 
 #start test emulator topology
 #python src/emuvim/examples/monitoring_demo_topology.py &
 
 # start a vnf
-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)'
+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)'
 
 sleep 1
 
 # monitor a metric
 son-emu-cli monitor setup_metric -vnf vnf1:output --metric tx_packets
 
-sleep 5
+# allow some time to gather metrics
+sleep 20
 
 # check if metric is monitored as expected (exported by son-emu, has vnf name as metric id)
-tx_rate=$(son-emu-cli monitor prometheus -d datacenter1 -vnf vnf1 -q 'rate(sonemu_tx_count_packets{vnf_name="vnf1"}[1m])')
+tx_rate=$(son-emu-cli monitor-zapi prometheus -d datacenter1 -vnf vnf1 -q 'rate(sonemu_tx_count_packets{vnf_name="vnf1"}[10s])')
 
+sleep 1
 
 # test if prometheus query worked
 echo $tx_rate
@@ -32,7 +37,7 @@ fi
 
 
 # check if cpu load can be monitored (exported by cAdvisor, needs uuid)
-cpu_load=$(son-emu-cli monitor prometheus -d datacenter1 -vnf vnf1 -q 'sum(rate(container_cpu_usage_seconds_total{id="/docker/<uuid>"}[10s]))')
+cpu_load=$(son-emu-cli monitor-zapi prometheus -d datacenter1 -vnf vnf1 -q 'sum(rate(container_cpu_usage_seconds_total{id="/docker/<uuid>"}[10s]))')
 
 sleep 1