From d058e8c4ede203bbb295ee80978dc89ef78589f4 Mon Sep 17 00:00:00 2001
From: Rafael Folco <rfolco@redhat.com>
Date: Tue, 12 Sep 2023 14:27:27 -0300
Subject: [PATCH] Add multibench support to all-in-one json

Add benchmarks block to identify bench ids.
The blockbreaker utility extracts the benchmark
from the runfile and processes multibench config.

This requires additional changes on the crucible
code to fully support 'benchmarks' block from the
json runfile.
---
 util/JSON/schema.json | 26 +++++++++++++++++++++++++-
 util/blockbreaker.py  | 25 +++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/util/JSON/schema.json b/util/JSON/schema.json
index 057da83d..175e78c7 100644
--- a/util/JSON/schema.json
+++ b/util/JSON/schema.json
@@ -10,11 +10,35 @@
                     "enum": [
                         "2022.11.08",
                         "2023.03.10",
-                        "2023.06.06"
+                        "2023.06.06",
+                        "2023.09.12"
                     ]
                 }
             }
         },
+        "benchmarks": {
+            "type": "array",
+            "items": {
+                "minItems": 1,
+                "uniqueItems": true,
+                "type": "object",
+                "properties": {
+                     "name": {
+                         "type": "string",
+                         "minLength": 1
+                     },
+                    "ids": {
+                        "type": "string",
+                        "pattern": "^[1-9][0-9]*(-[1-9][0-9]*)?$"
+                    }
+                },
+                "required": [
+                    "name",
+                    "ids"
+                ],
+                "additionalProperties": false
+            }
+        },
         "tags": {
             "type": "object",
             "additionalProperties": {
diff --git a/util/blockbreaker.py b/util/blockbreaker.py
index 4d99de14..c5a13b82 100755
--- a/util/blockbreaker.py
+++ b/util/blockbreaker.py
@@ -24,7 +24,7 @@ def process_options():
                         dest = "config",
                         required = True,
                         help = "Configuration type to get from the json file",
-                        choices = [ "mv-params", "tool-params", "passthru-args", "tags", "endpoint" ])
+                        choices = [ "benchmarks", "mv-params", "tool-params", "passthru-args", "tags", "endpoint" ])
 
     parser.add_argument("--index",
                         dest = "index",
@@ -205,6 +205,25 @@ def validate_schema(input_json, schema_file = None):
         return False
     return True
 
+def get_bench_ids(json_obj, cfg):
+    """Get benchmark names and ids from the benchmarks block"""
+    stream=""
+    if json_obj is None:
+        return ""
+    try:
+        bench_count = len(json_obj[cfg])
+        if bench_count > 0:
+            for idx in range(0, bench_count):
+                json_blk = json_obj[cfg][idx]
+                stream+=json_blk["name"]+":"+json_blk["ids"]+","
+            # remove last ","
+            if len(stream)>0:
+                stream = stream[:-1]
+    except:
+        pass
+
+    return stream
+
 def main():
     """Main function of get-json-config.py tool"""
 
@@ -217,7 +236,9 @@ def main():
     if not validate_schema(input_json):
         return 1
 
-    if args.config == "endpoint" or args.config == "tags":
+    if args.config == "benchmarks":
+        output = get_bench_ids(input_json, args.config)
+    elif args.config == "endpoint" or args.config == "tags":
         # output is a stream of the endpoint or tags 
         output = json_to_stream(input_json, args.config, args.index)
     else: