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=1e35e78245670f9f63e01a978319481829f1d42d;hb=4791774c7fa9b2e53c8d543b2856d51c5c158c4a;hp=de9e6963838f30a51455aeb5f3b252a522d7ca97;hpb=0a36632458caef9ca0888708f7b31087ddbe0e33;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 de9e696..1e35e78 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
@@ -13,12 +13,8 @@
 import os
 from pathlib import Path
 import yaml
-from common_helpers import get_prometheus_info
 
 
-# Prometheus host and port
-(prometheus_host, prometheus_port) = get_prometheus_info()
-
 # VIM configuration
 cloud_type = os.environ.get("CLOUD_TYPE", "openstack")
 if cloud_type == "openstack":
@@ -27,7 +23,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():
@@ -36,25 +36,35 @@ if cloud_type == "openstack":
         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"]:
+        if os_cloud not in clouds["clouds"]:
             raise Exception("Openstack cloud '" + os_cloud + "' not found")
         cloud = clouds["clouds"][os_cloud]
-        if not "username" in cloud["auth"]:
+        if "username" not in cloud["auth"]:
             raise Exception("Username not found in Openstack cloud '" + os_cloud + "'")
         vim_user = cloud["auth"]["username"]
-        if not "password" in cloud["auth"]:
+        if "password" not 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"]:
+        if "auth_url" not 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 + "'")
+        if "project_name" not 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_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 +74,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 +101,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 + "'")