X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Fresources%2Fbasic_01-crud_operations_on_vim_targets_data.py;h=2e3f95b0d3386a10cb1a44eeda3fe0d60569a969;hb=HEAD;hp=a1a29ed793824182e4a4221b6e2dab9454d72e7a;hpb=20c7b20f842572de252a76566bd5f08bb9044581;p=osm%2Ftests.git

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 a1a29ed..2e3f95b 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
@@ -12,50 +12,76 @@
 
 import os
 import yaml
-from pathlib import Path
+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_prefix = "basic_01_vim_test"
-# Get credentias 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 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
+# Variables to be used by the testsuite
+VIM_ACCOUNT_TYPE = ""
+VIM_NAME_PREFIX = ""
+VIM_USER = ""
+VIM_PASSWORD = ""
+VIM_AUTH_URL = ""
+VIM_TENANT = ""
+VIM_CONFIG = ""
+
+# VIM configuration
+cloud_type = os.environ.get("CLOUD_TYPE", "openstack")
+if cloud_type == "openstack":
+    # Openstack VIM
+    VIM_ACCOUNT_TYPE = "openstack"
+    VIM_NAME_PREFIX = "basic01"
+    # Get credentias from Openstack Clouds file
+    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 config
+    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"
+        )
+    )
 
-# Extra config
-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'))
+elif cloud_type == "azure":
+    # Azure VIM
+    VIM_ACCOUNT_TYPE = "azure"
+    VIM_NAME_PREFIX = "basic01"
+    VIM_AUTH_URL = "http://www.azure.com"
+    VIM_USER = os.environ.get("AZURE_CLIENT_ID")
+    VIM_PASSWORD = os.environ.get("AZURE_SECRET")
+    VIM_TENANT = os.environ.get("AZURE_TENANT")
 
+    # Extra config
+    vim_config_dict = {}
+    if "RESOURCE_GROUP" in os.environ:
+        vim_config_dict["resource_group"] = os.environ.get("RESOURCE_GROUP")
+    if "AZURE_REGION" in os.environ:
+        vim_config_dict["region_name"] = os.environ.get("AZURE_REGION")
+    if "AZURE_SUBSCRIPTION_ID" in os.environ:
+        vim_config_dict["subscription_id"] = os.environ.get("AZURE_SUBSCRIPTION_ID")
+    if "VNET_NAME" in os.environ:
+        vim_config_dict["vnet_name"] = os.environ.get("VNET_NAME")
+    if "AZURE_FLAVORS_PATTERN" in os.environ:
+        vim_config_dict["flavors_pattern"] = os.environ.get("AZURE_FLAVORS_PATTERN")
+    VIM_CONFIG = "'{}'".format(
+        yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip(
+            "\r\n"
+        )
+    )
+
+else:
+    raise Exception("VIM type not supported: '" + cloud_type + "'")