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=7fd16ba1de6966aeeced79f1399b3fe48def7fee;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=1522e031e1bfef5985f92a5ed895da7122522601;hpb=ad6e51f883d787c25e7717c9cb7761adada4e91f;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 1522e03..7fd16ba 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,54 +11,52 @@
 #   limitations under the License.
 
 import os
-import yaml
 from pathlib import Path
+import yaml
+from get_clouds_yaml_info import get_values_from_cloud, get_vim_values
 
-# 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"
 
 # VIM Configuration
 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 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 + "'")
-    vim_user = cloud["auth"]["username"]
-    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 + "'")
-    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 + "'")
-    vim_tenant = cloud["auth"]["project_name"]
-    vim_user_domain_name = cloud["auth"]["user_domain_name"] if "user_domain_name" in cloud["auth"] else "Default"
-    vim_project_domain_name = cloud["auth"]["project_domain_name"] if "project_domain_name" in cloud["auth"] else "Default"
+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 = "'{project_domain_name: " + vim_project_domain_name + ", user_domain_name: " + vim_user_domain_name + ", vim_network_name: " + os.environ.get("VIM_MGMT_NET") + ", disable_network_port_security: True}'"
+vim_config_dict = {}
+vim_config_dict["vim_network_name"] = os.environ.get("VIM_MGMT_NET")
+if vim_project_domain_name:
+    vim_config_dict["project_domain_name"] = vim_project_domain_name
+if vim_user_domain_name:
+    vim_config_dict["user_domain_name"] = vim_user_domain_name
+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(
+    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'
+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'
+vnfd_name = "hackfest_multivdu-vnf"
+nsd_name = "hackfest_multivdu-ns"
 # NS instance name
-ns_name = 'basic_08_disable_port_security_network_level_test'
+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'
+publickey = home + "/.ssh/id_rsa.pub"
+privatekey = home + "/.ssh/id_rsa"