From 48db0512f82329aa9f46ba9e87efb8a1846ba966 Mon Sep 17 00:00:00 2001 From: stevenvanrossem Date: Wed, 18 May 2016 15:43:24 +0200 Subject: [PATCH] update monitoring test scripts --- src/emuvim/cli/prometheus.py | 4 +++- src/emuvim/dcemulator/monitoring.py | 2 +- utils/ci/test_sdk_monitor.sh | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/emuvim/cli/prometheus.py b/src/emuvim/cli/prometheus.py index 8d87d89..26f18bf 100755 --- 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 --- a/src/emuvim/dcemulator/monitoring.py +++ b/src/emuvim/dcemulator/monitoring.py @@ -24,7 +24,7 @@ class DCNetworkMonitor(): def __init__(self, net): self.net = net - prometheus_ip = '0.0.0.0' + prometheus_ip = '127.0.0.1' prometheus_port = '9090' self.prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port) diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh index 3a1d09c..afd4b8c 100755 --- 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,9 +17,13 @@ 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/"}[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 -- 2.25.1