Merge pull request #109 from stevenvanrossem/master

update monitoring test scripts

diff --git a/src/emuvim/cli/prometheus.py b/src/emuvim/cli/prometheus.py
index 8d87d89..26f18bf 100755 (executable)
--- a/src/emuvim/cli/prometheus.py
+++ b/src/emuvim/cli/prometheus.py
@@ -6,7 +6,9 @@ Prometheus API helper functions
 import urllib2
 import ast
 
-prometheus_ip = '0.0.0.0'
+# set this to localhost for now
+# this is correct for son-emu started outside of a container or as a container with net=host
+prometheus_ip = '127.0.0.1'
 prometheus_port = '9090'
 prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port)
 

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 8db10da..f34b37c 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -24,7 +24,7 @@ class DCNetworkMonitor():
     def __init__(self, net):\r
         self.net = net\r
 \r
-        prometheus_ip = '0.0.0.0'\r
+        prometheus_ip = '127.0.0.1'\r
         prometheus_port = '9090'\r
         self.prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port)\r
 \r

diff --git a/src/emuvim/examples/monitoring_demo_topology.py b/src/emuvim/examples/monitoring_demo_topology.py
index 9a86534..0650be4 100755 (executable)
--- 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..afd4b8c 100755 (executable)
--- a/utils/ci/test_sdk_monitor.sh
+++ b/utils/ci/test_sdk_monitor.sh
@@ -6,6 +6,9 @@
 
 # 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)'
+
+sleep 1
+
 # monitor a metric
 son-emu-cli monitor setup_metric -vnf vnf1:output --metric tx_packets
 
@@ -14,18 +17,22 @@ 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]))')
 
+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
 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