From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 18 May 2016 08:59:48 +0000 (+0200)
Subject: update monitoring scripts
X-Git-Tag: v3.1~120^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=75009bd13b85cc4e7436c417ce7c7571511e700c

update monitoring scripts
---

diff --git a/src/emuvim/examples/monitoring_demo_topology.py b/src/emuvim/examples/monitoring_demo_topology.py
index 9a86534..0650be4 100755
--- a/src/emuvim/examples/monitoring_demo_topology.py
+++ b/src/emuvim/examples/monitoring_demo_topology.py
@@ -116,9 +116,9 @@ def create_topology1():
        can be executed again and again.
     """
     net.start()
-    #net.CLI()
+    net.CLI()
     # when the user types exit in the CLI, we stop the emulator
-    #net.stop()
+    net.stop()
 
 
 def main():
diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh
index 370ca80..3a1d09c 100755
--- a/utils/ci/test_sdk_monitor.sh
+++ b/utils/ci/test_sdk_monitor.sh
@@ -21,11 +21,11 @@ son-emu-cli monitor stop_metric -vnf vnf1:output --metric tx_packets
 son-emu-cli compute stop -d datacenter1 -n vnf1
 
 # test if prometheus query worked
+echo $cpu_load
 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