X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Fresources%2Fepa_03-crud_operations_on_sdnc_data.py;fp=robot-systest%2Fresources%2Fepa_03-crud_operations_on_sdnc_data.py;h=d195cde654678982d2903811c90c7dd8399a1c7d;hb=347a779370b29bba7421cdfd9e30048b4ed559a5;hp=9a2b201ec6bcf89d45ebfad3e8da0d575ef56386;hpb=a5704d6a060b5329e10488a351c50495be69d680;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 9a2b201..d195cde 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,38 +11,28 @@
 #   limitations under the License.
 
 import os
-from pathlib import Path
 import yaml
-
-from common_helpers import get_prometheus_info
-
+from pathlib import Path
 
 # Prometheus host and port
-(prometheus_host, prometheus_port) = get_prometheus_info()
+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"
 
-# VIM Configuration
-sdnc_type = "onos"
+# SDNC Configuration
 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_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")