switches key of storageprofile to avoid regex issues

Author: NielsKorschinsky

python/sppConnection/api_queries.py

@@ -109,6 +109,10 @@ def get_all_vms(self) -> List[Dict[str, Any]]:
     def get_vms_per_sla(self) -> List[Dict[str, Any]]:
         """retrieves and calculates all vmware per SLA."""
         endpoint = "/api/endeavour/catalog/recovery/hypervisorvm"
+        allow_list = [
+            "_id.protectionInfo.storageProfileName",
+            "count"
+        ]
         params = {
             "action": "aggregate",
             "pageSize": None
@@ -118,19 +122,20 @@ def get_vms_per_sla(self) -> List[Dict[str, Any]]:
             "op":[
                 {
                     "operation": "count",
-                    "fieldname": "protectionInfo.policyName",
+                    "fieldname": "protectionInfo.storageProfileName",
                     "outputname": "vmCountBySLA" # buggy request, does actually not change anything
                 }
             ],
             "group": [
-                "protectionInfo.policyName"
+                "protectionInfo.storageProfileName"
             ]
         }
 
         return self.__rest_client.get_objects(
             endpoint=endpoint,
             params=params,
             request_type=RequestType.POST,
+            allow_list=allow_list,
             post_data=post_data,
             add_time_stamp=True,
             array_name="results")

python/sppConnection/rest_client.py

@@ -357,7 +357,6 @@ def query_url(
 
             # send the query
             try:
-                start_time = time.perf_counter()
                 if(request_type == RequestType.GET):
                     response_query = get(
                         url=url, headers=self.__headers, verify=False,
@@ -368,8 +367,7 @@ def query_url(
                         url=url, headers=self.__headers, verify=False,
                         params=params, json=post_data, auth=auth,
                         timeout=(self.__initial_connection_timeout, self.__timeout))
-                end_time = time.perf_counter()
-                send_time = (end_time - start_time)
+                send_time = response_query.elapsed.total_seconds()
 
             except ReadTimeout as timeout_error:
 

python/sppmonMethods/protection.py

@@ -57,23 +57,10 @@ def vms_per_sla(self) -> None:
             name="VMs per SLA",
             source_func=self.__api_queries.get_vms_per_sla,
             rename_tuples=[
-                ("_id.protectionInfo.policyName", "slaName"),
+                ("storageProfileName", "slaName"),
                 ("count", "vmCountBySLA") # buggy request
-            ],
-            deactivate_verbose=True
+            ]
         )
-
-        # the endpoint offers a prefix `vmware_`
-        # due to compability reasons the prefix is removed
-        # may be reintroduced if other types occur.
-        pattern = compile(r"^vmware_")
-        for sla in result:
-            # replaces the first occurence
-            sla['slaName'] = sub(pattern, "", sla['slaName'], 1)
-
-        if(self.__verbose):
-            MethodUtils.my_print(result)
-
         LOGGER.info(">> inserting number of VMs per SLA into DB")
         self.__influx_client.insert_dicts_to_buffer(
             table_name="slaStats", list_with_dicts=result)