fixes for aggregate command

Signed-off-by: Michael Oviedo <[email protected]>

Author: OVI3D0

osbenchmark/aggregator.py

@@ -159,14 +159,14 @@ def update_config_object(self, test_run: TestRun) -> None:
         """
         current_timestamp = self.config.opts("system", "time.start")
         self.config.add(config.Scope.applicationOverride, "builder",
-                        "cluster_config_instance.names", test_run.cluster_config_instance)
+                        "cluster_config.names", test_run.cluster_config)
         self.config.add(config.Scope.applicationOverride, "system",
                         "env.name", test_run.environment_name)
         self.config.add(config.Scope.applicationOverride, "system", "time.start", current_timestamp)
         self.config.add(config.Scope.applicationOverride, "test_run", "pipeline", test_run.pipeline)
         self.config.add(config.Scope.applicationOverride, "workload", "params", test_run.workload_params)
         self.config.add(config.Scope.applicationOverride, "builder",
-                        "cluster_config_instance.params", test_run.cluster_config_instance_params)
+                        "cluster_config.params", test_run.cluster_config)
         self.config.add(config.Scope.applicationOverride, "builder", "plugin.params", test_run.plugin_params)
         self.config.add(config.Scope.applicationOverride, "workload", "latency.percentiles", test_run.latency_percentiles)
         self.config.add(config.Scope.applicationOverride, "workload", "throughput.percentiles", test_run.throughput_percentiles)

osbenchmark/metrics.py

@@ -1537,7 +1537,7 @@ def store_test_run(self, test_run):
                 open_browser = True
             self.store_html_results(test_run, open_browser)
 
-    def store_aggregated_execution(self, test_run):
+    def store_aggregated_run(self, test_run):
         doc = test_run.as_dict()
         aggregated_execution_path = paths.aggregated_results_root(self.cfg, test_run_id=test_run.test_run_id)
         io.ensure_dir(aggregated_execution_path)