update monitoring scripts
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 18 May 2016 08:59:48 +0000 (10:59 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 18 May 2016 08:59:48 +0000 (10:59 +0200)
src/emuvim/examples/monitoring_demo_topology.py
utils/ci/test_sdk_monitor.sh

index 9a86534..0650be4 100755 (executable)
@@ -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():
index 370ca80..3a1d09c 100755 (executable)
@@ -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