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=ab2edd8e63ee091000818fc2cb9374160108847a;hb=2d4de332830e2f6deb4705fcc85d140c92e27c2c;hp=2c158715453daf3e03175c3ae353a083ff679dcd;hpb=a5704d6a060b5329e10488a351c50495be69d680;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 2c15871..ab2edd8 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 @@ -14,11 +14,6 @@ import os from pathlib import Path import yaml -from common_helpers import get_prometheus_info - - -# Prometheus host and port -(prometheus_host, prometheus_port) = get_prometheus_info() # VIM Configuration vim_account_type = "openstack" @@ -26,7 +21,11 @@ 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"] +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(): @@ -35,23 +34,31 @@ 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"]: + if os_cloud not in clouds["clouds"]: raise Exception("Openstack cloud '" + os_cloud + "' not found") cloud = clouds["clouds"][os_cloud] - if not "username" in cloud["auth"]: + if "username" not in cloud["auth"]: raise Exception("Username not found in Openstack cloud '" + os_cloud + "'") vim_user = cloud["auth"]["username"] - if not "password" in cloud["auth"]: + if "password" not 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"]: + 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 not "project_name" in cloud["auth"]: + 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_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 # Extra VIM config @@ -64,18 +71,21 @@ if vim_user_domain_name: if vim_insecure: vim_config_dict["insecure"] = True vim_config_dict["disable_network_port_security"] = True -vim_config = "'{}'".format(yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip('\r\n')) +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"