projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsi_lib: update timeouts with the env modifier OSM_VIM_MULTIPLIER_TIMEOUT
[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
a1a29ed
..
b1db1c5
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
@@
-11,16
+11,13
@@
# limitations under the License.
import os
# limitations under the License.
import os
-import yaml
from pathlib import Path
from pathlib import Path
+import yaml
+from common_helpers import get_prometheus_info
+
# Prometheus host and port
# 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_host, prometheus_port) = get_prometheus_info()
# VIM Configuration
vim_account_type = "openstack"
# VIM Configuration
vim_account_type = "openstack"
@@
-30,19
+27,26
@@
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)
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")
+ 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)
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")
+ if not os_cloud in clouds["clouds"]:
+ raise Exception("Openstack cloud '" + os_cloud + "' not found")
cloud = clouds["clouds"][os_cloud]
cloud = clouds["clouds"][os_cloud]
- if not "username" in cloud["auth"]: raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
+ if not "username" in cloud["auth"]:
+ raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
vim_user = cloud["auth"]["username"]
vim_user = cloud["auth"]["username"]
- if not "password" in cloud["auth"]: raise Exception("Password not found in Openstack cloud '" + os_cloud + "'")
+ if not "password" in cloud["auth"]:
+ raise Exception("Password not found in Openstack cloud '" + os_cloud + "'")
vim_password = cloud["auth"]["password"]
vim_password = cloud["auth"]["password"]
- if not "auth_url" in cloud["auth"]: raise Exception("Auth url not found in Openstack cloud '" + os_cloud + "'")
+ 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"]
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 + "'")
+ 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_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
@@
-58,4
+62,3
@@
if 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'))
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'))
-