Fix for bug 1669 -- SA02 robot test fails as threshold not reached

[osm/tests.git] / robot-systest / resources / sa_07-alarms_from_sa-related_vnfs_data.py

diff --git a/robot-systest/resources/sa_07-alarms_from_sa-related_vnfs_data.py b/robot-systest/resources/sa_07-alarms_from_sa-related_vnfs_data.py
index 22fa448..0a52667 100644 (file)
--- a/robot-systest/resources/sa_07-alarms_from_sa-related_vnfs_data.py
+++ b/robot-systest/resources/sa_07-alarms_from_sa-related_vnfs_data.py
@@ -11,16 +11,16 @@
 #   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 polling interval and retries
+prometheus_poll_retries = '15 times'
+prometheus_poll_timeout = '1 minute'
 # Webhook Service NS and VNF descriptor package folder
 ws_vnfd_pkg = 'hackfest_basic_vnf'
 ws_nsd_pkg = 'hackfest_basic_ns'
@@ -47,7 +47,7 @@ new_vnfd_pkg = 'new_cirros_alarm_vnf'
 vnfd_name = 'cirros_alarm-vnf'
 nsd_name = 'cirros_alarm-ns'
 # NS instance name
-ns_name = 'sa_07-alarms_from_sa-related_vnfs_test'
+ns_name = 'sa_07-alarm_test'
 # SSH keys to be used
 publickey = home + '/.ssh/id_rsa.pub'
 privatekey = home + '/.ssh/id_rsa'