projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix OSM_HOSTNAME for public cloud tests in Azure
[osm/tests.git]
/
robot-systest
/
resources
/
basic_32-volume_with_different_az.py
diff --git
a/robot-systest/resources/basic_32-volume_with_different_az.py
b/robot-systest/resources/basic_32-volume_with_different_az.py
index
2a78e11
..
5c0a1f6
100644
(file)
--- a/
robot-systest/resources/basic_32-volume_with_different_az.py
+++ b/
robot-systest/resources/basic_32-volume_with_different_az.py
@@
-15,19
+15,28
@@
import yaml
from get_clouds_yaml_info import get_values_from_cloud, get_vim_values
from get_clouds_yaml_info import get_values_from_cloud, get_vim_values
+# Variables to be used by the testsuite
+VIM_ACCOUNT_TYPE = "openstack"
+VIM_NAME = "basic_08_vim_test"
+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 configuration
cloud_type = os.environ.get("CLOUD_TYPE", "openstack")
if cloud_type == "openstack":
# Openstack VIM
-
vim_account_type
= "openstack"
+
VIM_ACCOUNT_TYPE
= "openstack"
vim_name_prefix = "basic32"
# Get credentias from Openstack Clouds file
cloud, os_cloud = get_values_from_cloud()
(
vim_name_prefix = "basic32"
# Get credentias from Openstack Clouds file
cloud, os_cloud = get_values_from_cloud()
(
-
vim_user
,
-
vim_password
,
-
vim_auth_url
,
-
vim_tenant
,
+
VIM_USER
,
+
VIM_PASSWORD
,
+
VIM_AUTH_URL
,
+
VIM_TENANT
,
vim_user_domain_name,
vim_project_domain_name,
vim_insecure,
vim_user_domain_name,
vim_project_domain_name,
vim_insecure,
@@
-35,7
+44,7
@@
if cloud_type == "openstack":
# Availability Zone config
vim_config_dict = {"storage_availability_zone": "storage_az"}
# Availability Zone config
vim_config_dict = {"storage_availability_zone": "storage_az"}
-
vim_config
= "'{}'".format(
+
VIM_CONFIG
= "'{}'".format(
yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip(
"\r\n"
)
yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip(
"\r\n"
)