Merge remote-tracking branch 'origin/master' into paas

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

diff --git a/robot-systest/resources/common_helpers.py b/robot-systest/resources/common_helpers.py
index 8ffaffe..3753555 100644 (file)
--- a/robot-systest/resources/common_helpers.py
+++ b/robot-systest/resources/common_helpers.py
@@ -13,10 +13,19 @@ import os
 
 
 def get_prometheus_info():
-    if os.environ.get('PROMETHEUS_HOSTNAME', False):
-        prometheus_host = os.environ.get('PROMETHEUS_HOSTNAME')
-        prometheus_port = os.environ.get('PROMETHEUS_PORT', 9090)
+    if os.environ.get("PROMETHEUS_HOSTNAME", False):
+        prometheus_host = os.environ.get("PROMETHEUS_HOSTNAME")
+        prometheus_port = os.environ.get("PROMETHEUS_PORT", 9090)
     else:
-        prometheus_host = os.environ.get('OSM_HOSTNAME')
-        prometheus_port = os.environ.get('PROMETHEUS_PORT', 9091)
-    return prometheus_host, prometheus_port
+        prometheus_host = os.environ.get("OSM_HOSTNAME")
+        prometheus_port = os.environ.get("PROMETHEUS_PORT", 9091)
+    prometheus_user = os.environ.get("PROMETHEUS_USER", "")
+    prometheus_password = os.environ.get("PROMETHEUS_PASSWORD", "")
+    return prometheus_host, prometheus_port, prometheus_user, prometheus_password
+
+
+def get_osm_info():
+    osm_user = os.environ.get("OSM_USER", "admin")
+    osm_password = os.environ.get("OSM_PASSWORD", "admin")
+    osm_project = os.environ.get("OSM_PROJECT", "admin")
+    return osm_user, osm_password, osm_project