projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAIL01 test: read the RAM quota in Openstack
[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
f281cce
..
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,15
+11,12
@@
# limitations under the License.
from pathlib import Path
# limitations under the License.
from pathlib import Path
-import os
+
+from common_helpers import get_prometheus_info
+
# Prometheus host and port
# 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 polling interval and retries
prometheus_poll_retries = '15 times'
@@
-50,7
+47,7
@@
new_vnfd_pkg = 'new_cirros_alarm_vnf'
vnfd_name = 'cirros_alarm-vnf'
nsd_name = 'cirros_alarm-ns'
# NS instance name
vnfd_name = 'cirros_alarm-vnf'
nsd_name = 'cirros_alarm-ns'
# NS instance name
-ns_name = 'sa_07-alarm
s_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'
# SSH keys to be used
publickey = home + '/.ssh/id_rsa.pub'
privatekey = home + '/.ssh/id_rsa'