X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Fresources%2Fepa_03-crud_operations_on_sdnc_data.py;h=029cb2bcb708fa605072149fbb3fd952d808a876;hb=6f0aed334a3de69392609b6073927526b385dc6c;hp=72eb986bc0f0b825c8a6b50a1c04e5652ae436d1;hpb=6403533bdacfc641c6a23810e6f9e8f912cd3831;p=osm%2Ftests.git

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..029cb2b 100644
--- 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,34 +11,28 @@
 #   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"
-sdnc_name = "epa_03_crud_operations_on_sdnc_test"
-# Get credentials from ONOS SDNCs file
-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")
-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")
-    sdnc = sdncs["sdncs"][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 + "'")
-    sdnc_password = sdnc["auth"]["password"]
-    if not "url" in sdnc["auth"]: raise Exception("URL not found in SDN controller '" + os_sdnc + "'")
-    sdnc_url = sdnc["auth"]["url"]
+# SDNC Configuration
+sdnc_name = "epa_03"
+sdnc_user = os.environ.get("SDNC_USER")
+if not sdnc_user:
+    raise Exception("'SDNC_USER' environment variable not found")
+sdnc_password = os.environ.get("SDNC_PASSWORD")
+if not sdnc_password:
+    raise Exception("'SDNC_PASSWORD' environment variable not found")
+sdnc_url = os.environ.get("SDNC_URL")
+if not sdnc_url:
+    raise Exception("'SDNC_URL' environment variable not found")
+sdnc_type = os.environ.get("SDNC_TYPE")
+if not sdnc_type:
+    raise Exception("'SDNC_TYPE' environment variable not found")