X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Fresources%2Fbasic_08-disable_port_security_network_level_data.py;fp=robot-systest%2Fresources%2Fbasic_08-disable_port_security_network_level_data.py;h=2c158715453daf3e03175c3ae353a083ff679dcd;hb=a5704d6a060b5329e10488a351c50495be69d680;hp=93524642a25bb32e77ffa91724fedf7f730654ae;hpb=02454daa68b47818fc9fc7d479b8ef85b51c1603;p=osm%2Ftests.git

diff --git a/robot-systest/resources/basic_08-disable_port_security_network_level_data.py b/robot-systest/resources/basic_08-disable_port_security_network_level_data.py
index 9352464..2c15871 100644
--- a/robot-systest/resources/basic_08-disable_port_security_network_level_data.py
+++ b/robot-systest/resources/basic_08-disable_port_security_network_level_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
 vim_account_type = "openstack"
@@ -31,19 +29,26 @@ os_cloud = os.environ.get("OS_CLOUD")
 clouds_file_paths = ["./clouds.yaml", str(Path.home()) + "/.config/openstack/clouds.yaml", "/etc/openstack/clouds.yaml"]
 for path in clouds_file_paths:
     clouds_file_path = Path(path)
-    if clouds_file_path.exists(): break
-if not clouds_file_path.exists(): raise Exception("Openstack clouds file not found")
+    if clouds_file_path.exists():
+        break
+if not clouds_file_path.exists():
+    raise Exception("Openstack clouds file not found")
 with clouds_file_path.open() as clouds_file:
     clouds = yaml.safe_load(clouds_file)
-    if not os_cloud in clouds["clouds"]: raise Exception("Openstack cloud '" + os_cloud + "' not found")
+    if not os_cloud in clouds["clouds"]:
+        raise Exception("Openstack cloud '" + os_cloud + "' not found")
     cloud = clouds["clouds"][os_cloud]
-    if not "username" in cloud["auth"]: raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
+    if not "username" in cloud["auth"]:
+        raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
     vim_user = cloud["auth"]["username"]
-    if not "password" in cloud["auth"]: raise Exception("Password not found in Openstack cloud '" + os_cloud + "'")
+    if not "password" in cloud["auth"]:
+        raise Exception("Password not found in Openstack cloud '" + os_cloud + "'")
     vim_password = cloud["auth"]["password"]
-    if not "auth_url" in cloud["auth"]: raise Exception("Auth url not found in Openstack cloud '" + os_cloud + "'")
+    if not "auth_url" in cloud["auth"]:
+        raise Exception("Auth url not found in Openstack cloud '" + os_cloud + "'")
     vim_auth_url = cloud["auth"]["auth_url"]
-    if not "project_name" in cloud["auth"]: raise Exception("Project name not found in Openstack cloud '" + os_cloud + "'")
+    if not "project_name" in cloud["auth"]:
+        raise Exception("Project name not found in Openstack cloud '" + os_cloud + "'")
     vim_tenant = cloud["auth"]["project_name"]
     vim_user_domain_name = cloud["auth"]["user_domain_name"] if "user_domain_name" in cloud["auth"] else None
     vim_project_domain_name = cloud["auth"]["project_domain_name"] if "project_domain_name" in cloud["auth"] else None
@@ -74,4 +79,3 @@ ns_name = 'basic_08_disable_port_security_network_level_test'
 # SSH keys to be used
 publickey = home + '/.ssh/id_rsa.pub'
 privatekey = home + '/.ssh/id_rsa'
-