Feature 11003: AZ for cinder

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

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 ab2edd8..7fd16ba 100644 (file)
--- 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
@@ -13,6 +13,7 @@
 import os
 from pathlib import Path
 import yaml
+from get_clouds_yaml_info import get_values_from_cloud, get_vim_values
 
 
 # VIM Configuration
@@ -20,46 +21,16 @@ vim_account_type = "openstack"
 vim_name = "basic_08_vim_test"
 
 # Get credentials from Openstack clouds file
-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")
-with clouds_file_path.open() as clouds_file:
-    clouds = yaml.safe_load(clouds_file)
-    if os_cloud not in clouds["clouds"]:
-        raise Exception("Openstack cloud '" + os_cloud + "' not found")
-    cloud = clouds["clouds"][os_cloud]
-    if "username" not in cloud["auth"]:
-        raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
-    vim_user = cloud["auth"]["username"]
-    if "password" not in cloud["auth"]:
-        raise Exception("Password not found in Openstack cloud '" + os_cloud + "'")
-    vim_password = cloud["auth"]["password"]
-    if "auth_url" not in cloud["auth"]:
-        raise Exception("Auth url not found in Openstack cloud '" + os_cloud + "'")
-    vim_auth_url = cloud["auth"]["auth_url"]
-    if "project_name" not 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
-    )
-    vim_insecure = True if "verify" in cloud and not cloud["verify"] else None
+cloud, os_cloud = get_values_from_cloud()
+(
+    vim_user,
+    vim_password,
+    vim_auth_url,
+    vim_tenant,
+    vim_user_domain_name,
+    vim_project_domain_name,
+    vim_insecure,
+) = get_vim_values(cloud, os_cloud)
 
 # Extra VIM config
 vim_config_dict = {}