Updated SA02 test: CPU threshold read from VNF package

[osm/tests.git] / robot-systest / resources / sa_02-vnf_with_vim_metrics_and_autoscaling_data.py

diff --git a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
index 2821a60..1824990 100644 (file)
--- a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
+++ b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
@@ -11,19 +11,18 @@
 #   limitations under the License.
 
 from pathlib import Path
-import os
+
+from common_helpers import get_prometheus_info
+
 
 # Prometheus host and port
-if os.environ.get('PROMETHEUS_HOSTNAME', False):
-    prometheus_host = os.environ.get('PROMETHEUS_HOSTNAME')
-    prometheus_port = '9090'
-else:
-    prometheus_host = os.environ.get('OSM_HOSTNAME')
-    prometheus_port = '9091'
+(prometheus_host, prometheus_port) = get_prometheus_info()
 
-# Prometheus metric and threshold
+# Prometheus polling interval and retries
+prometheus_poll_retries = '15 times'
+prometheus_poll_timeout = '1 minute'
+# Prometheus metric
 metric_name = 'osm_cpu_utilization'
-metric_threshold = 60
 # Get ${HOME} from local machine
 home = str(Path.home())
 # NS and VNF descriptor package folder
@@ -33,8 +32,7 @@ nsd_pkg = 'hackfest_basic_metrics_ns'
 vnfd_name = 'hackfest_basic_metrics-vnf'
 nsd_name = 'hackfest_basic-ns-metrics'
 # NS instance name
-ns_name = 'sa_02-vnf_with_vim_metrics_and_autoscaling_test'
+ns_name = 'sa_02'
 # SSH keys to be used
 publickey = home + '/.ssh/id_rsa.pub'
 privatekey = home + '/.ssh/id_rsa'
-