Fix vim config for basic-01 and basic-08: added insecure option if present in clouds...

[osm/tests.git] / robot-systest / resources / basic_01-crud_operations_on_vim_targets_data.py

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 0b119d8..a1a29ed 100644 (file)
--- 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
@@ -17,9 +17,10 @@ from pathlib import Path
 # 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"
+    prometheus_port = "9091"
 
 # VIM Configuration
 vim_account_type = "openstack"
@@ -43,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'))
+