From 41c7f18dcc976412eaca4db6079f6ee08638fb5c Mon Sep 17 00:00:00 2001
From: Michael Oviedo <mikeovi@amazon.com>
Date: Thu, 24 Oct 2024 22:03:57 +0000
Subject: [PATCH] abstract logic to list test executions + aggregated results

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
---
 osbenchmark/benchmark.py |  2 +-
 osbenchmark/metrics.py   | 50 +++++++---------------------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/osbenchmark/benchmark.py b/osbenchmark/benchmark.py
index aee837ab..8af429a7 100644
--- a/osbenchmark/benchmark.py
+++ b/osbenchmark/benchmark.py
@@ -699,7 +699,7 @@ def dispatch_list(cfg):
     elif what == "test_executions":
         metrics.list_test_executions(cfg)
     elif what == "aggregated_results":
-        metrics.list_aggregated_test_results(cfg)
+        metrics.list_aggregated_results(cfg)
     elif what == "provision_config_instances":
         provision_config.list_provision_config_instances(cfg)
     elif what == "opensearch-plugins":
diff --git a/osbenchmark/metrics.py b/osbenchmark/metrics.py
index fa6282c9..861c8df5 100644
--- a/osbenchmark/metrics.py
+++ b/osbenchmark/metrics.py
@@ -1275,7 +1275,7 @@ def results_store(cfg):
         return NoopResultsStore()
 
 
-def list_test_executions(cfg):
+def list_test_helper(store, title):
     def format_dict(d):
         if d:
             items = sorted(d.items())
@@ -1284,7 +1284,7 @@ def format_dict(d):
             return None
 
     test_executions = []
-    for test_execution in test_execution_store(cfg).list():
+    for test_execution in store:
         test_executions.append([
             test_execution.test_execution_id,
             time.to_iso8601(test_execution.test_execution_timestamp),
@@ -1297,7 +1297,7 @@ def format_dict(d):
             test_execution.provision_config_revision])
 
     if len(test_executions) > 0:
-        console.println("\nRecent test_executions:\n")
+        console.println(f"\nRecent {title}:\n")
         console.println(tabulate.tabulate(
             test_executions,
             headers=[
@@ -1313,47 +1313,13 @@ def format_dict(d):
                 ]))
     else:
         console.println("")
-        console.println("No recent test_executions found.")
-
-def list_aggregated_test_results(cfg):
-    def format_dict(d):
-        if d:
-            items = sorted(d.items())
-            return ", ".join(["%s=%s" % (k, v) for k, v in items])
-        else:
-            return None
+        console.println(f"No recent {title} found.")
 
-    aggregated_test_executions = []
-    for test_execution in test_execution_store(cfg).list_aggregations():
-        aggregated_test_executions.append([
-            test_execution.test_execution_id,
-            time.to_iso8601(test_execution.test_execution_timestamp),
-            test_execution.workload,
-            format_dict(test_execution.workload_params),
-            test_execution.test_procedure_name,
-            test_execution.provision_config_instance_name,
-            format_dict(test_execution.user_tags),
-            test_execution.workload_revision,
-            test_execution.provision_config_revision])
+def list_test_executions(cfg):
+    list_test_helper(test_execution_store(cfg).list(), "test_executions")
 
-    if len(aggregated_test_executions) > 0:
-        console.println("\nRecent aggregated test executions:\n")
-        console.println(tabulate.tabulate(
-            aggregated_test_executions,
-            headers=[
-                "TestExecution ID",
-                "TestExecution Timestamp",
-                "Workload",
-                "Workload Parameters",
-                "TestProcedure",
-                "ProvisionConfigInstance",
-                "User Tags",
-                "workload Revision",
-                "Provision Config Revision"
-                ]))
-    else:
-        console.println("")
-        console.println("No recent aggregate tests found.")
+def list_aggregated_results(cfg):
+    list_test_helper(test_execution_store(cfg).list_aggregations(), "aggregated_results")
 
 def create_test_execution(cfg, workload, test_procedure, workload_revision=None):
     provision_config_instance = cfg.opts("builder", "provision_config_instance.names")