Add PROMETHEUS_PORT

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

diff --git a/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py b/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py
index 72eb986..9a2b201 100644 (file)
--- a/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py
+++ b/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py
@@ -11,16 +11,14 @@
 #   limitations under the License.
 
 import os
-import yaml
 from pathlib import Path
+import yaml
+
+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()
 
 # VIM Configuration
 sdnc_type = "onos"
@@ -30,15 +28,21 @@ os_sdnc = os.environ.get("OS_SDNC")
 sdncs_file_paths = ["./sdncs.yaml", str(Path.home()) + "/.config/onos/sdncs.yaml"]
 for path in sdncs_file_paths:
     sdncs_file_path = Path(path)
-    if sdncs_file_path.exists(): break
-if not sdncs_file_path.exists(): raise Exception("ONOS sdncs file not found")
+    if sdncs_file_path.exists():
+        break
+if not sdncs_file_path.exists():
+    raise Exception("ONOS sdncs file not found")
 with sdncs_file_path.open() as sdncs_file:
     sdncs = yaml.safe_load(sdncs_file)
-    if not os_sdnc in sdncs["sdncs"]: raise Exception("SDN controller '" + os_sdnc + "' not found")
+    if not os_sdnc in sdncs["sdncs"]:
+        raise Exception("SDN controller '" + os_sdnc + "' not found")
     sdnc = sdncs["sdncs"][os_sdnc]
-    if not "username" in sdnc["auth"]: raise Exception("Username not found in SDN controller '" + os_sdnc + "'")
+    if not "username" in sdnc["auth"]:
+        raise Exception("Username not found in SDN controller '" + os_sdnc + "'")
     sdnc_user = sdnc["auth"]["username"]
-    if not "password" in sdnc["auth"]: raise Exception("Password not found in SDN controller '" + os_sdnc + "'")
+    if not "password" in sdnc["auth"]:
+        raise Exception("Password not found in SDN controller '" + os_sdnc + "'")
     sdnc_password = sdnc["auth"]["password"]
-    if not "url" in sdnc["auth"]: raise Exception("URL not found in SDN controller '" + os_sdnc + "'")
+    if not "url" in sdnc["auth"]:
+        raise Exception("URL not found in SDN controller '" + os_sdnc + "'")
     sdnc_url = sdnc["auth"]["url"]