From 20c7b20f842572de252a76566bd5f08bb9044581 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 2 Oct 2020 15:01:37 +0000 Subject: [PATCH] Fix vim config for basic-01 and basic-08: added insecure option if present in clouds.yaml Change-Id: I90021dc72167765552841fd34b9b8f7a4d63cac8 Signed-off-by: garciadeblas --- ..._01-crud_operations_on_vim_targets_data.py | 17 ++++++++++++++--- ...isable_port_security_network_level_data.py | 19 ++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/robot-systest/resources/basic_01-crud_operations_on_vim_targets_data.py b/robot-systest/resources/basic_01-crud_operations_on_vim_targets_data.py index 58c0382..a1a29ed 100644 --- a/robot-systest/resources/basic_01-crud_operations_on_vim_targets_data.py +++ b/robot-systest/resources/basic_01-crud_operations_on_vim_targets_data.py @@ -44,7 +44,18 @@ with clouds_file_path.open() as clouds_file: 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" + 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 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") + "}'" +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 = "'{}'".format(yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip('\r\n')) + 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..9352464 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 @@ -25,6 +25,7 @@ else: # 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"] @@ -44,10 +45,21 @@ with clouds_file_path.open() as clouds_file: 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" + 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 -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 = "'{}'".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()) @@ -62,3 +74,4 @@ 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' + -- 2.25.1