Merge remote-tracking branch 'origin/master' into paas

[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 de9e696..c56d51a 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,7 +17,12 @@ from common_helpers import get_prometheus_info
 
 
 # Prometheus host and port
-(prometheus_host, prometheus_port) = get_prometheus_info()
+(
+    prometheus_host,
+    prometheus_port,
+    prometheus_user,
+    prometheus_password,
+) = get_prometheus_info()
 
 # VIM configuration
 cloud_type = os.environ.get("CLOUD_TYPE", "openstack")
@@ -27,7 +32,11 @@ if cloud_type == "openstack":
     vim_name_prefix = "basic01"
     # 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"]
+    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():
@@ -49,12 +58,22 @@ if cloud_type == "openstack":
             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 + "'")
+            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_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_dict = {}
     vim_config_dict["vim_network_name"] = os.environ.get("VIM_MGMT_NET")
@@ -64,7 +83,11 @@ if cloud_type == "openstack":
         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'))
+    vim_config = "'{}'".format(
+        yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip(
+            "\r\n"
+        )
+    )
 
 elif cloud_type == "azure":
     # Azure VIM
@@ -87,7 +110,11 @@ elif cloud_type == "azure":
         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'))
+    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 + "'")