X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Fresources%2Fbasic_08-disable_port_security_network_level_data.py;h=f4ee5f373b4ab869c1309c941bf94538cdaf435d;hb=HEAD;hp=ab2edd8e63ee091000818fc2cb9374160108847a;hpb=2d4de332830e2f6deb4705fcc85d140c92e27c2c;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 ab2edd8..20b7748 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,55 +11,30 @@
 #   limitations under the License.
 
 import os
-from pathlib import Path
 import yaml
+from get_clouds_yaml_info import get_values_from_cloud, get_vim_values
 
 
-# VIM Configuration
-vim_account_type = "openstack"
-vim_name = "basic_08_vim_test"
+# Variables to be used by the testsuite
+VIM_ACCOUNT_TYPE = "openstack"
+VIM_NAME = "basic_08_vim_test"
+VIM_USER = ""
+VIM_PASSWORD = ""
+VIM_AUTH_URL = ""
+VIM_TENANT = ""
+VIM_CONFIG = ""
 
 # 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 = {}
@@ -72,20 +47,6 @@ if vim_insecure:
     vim_config_dict["insecure"] = True
 vim_config_dict["disable_network_port_security"] = True
 vim_config_dict["management_network_name"] = os.environ.get("VIM_MGMT_NET")
-vim_config = "'{}'".format(
+VIM_CONFIG = "'{}'".format(
     yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip("\r\n")
 )
-
-# Get ${HOME} from local machine
-home = str(Path.home())
-# NS and VNF descriptor package folder
-vnfd_pkg = "hackfest_multivdu_vnf"
-nsd_pkg = "hackfest_multivdu_ns"
-# NS and VNF descriptor id
-vnfd_name = "hackfest_multivdu-vnf"
-nsd_name = "hackfest_multivdu-ns"
-# NS instance name
-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"