commit 7e6d0323eadb9bfe4dc8db211dd5536fb8ef1763
author Tam Nguyen <tamnguyenchi@os.amperecomputing.com> Fri Dec 27 09:47:38 2024 +0700
committer tamnguyenchi@os.amperecomputing.com <tamnguyenchi@os.amperecomputing.com> Thu Jan 02 21:04:40 2025 +0000
tree 02fbccb6a6692d57c5d459556b239941a39b2166
parent 38afdb919e17766b8ab8a36f5d1191c21b9be019

Fix out of range error when input non default registries

The parse_registries.py generates base, heartbeat, resource and taskevent
registries without checking input registries list. Which causes out of range
error when input non default value.
This commit only generates above registries if they are input.

Tested:
Input only openbmc registry passes.
Input only heartbeat registry passes.
Run with default registries passes.

Change-Id: Ibb6e6ee9f241c424bb78782466eb3199b11332c3
Signed-off-by: Tam Nguyen <tamnguyenchi@os.amperecomputing.com>

scripts/parse_registries.py

diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 75dd381..7419016 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -739,7 +739,7 @@
 
 
 def main():
-    dmtf_registries = (
+    dmtf_registries = OrderedDict([
         ("base", "1.19.0"),
         ("composition", "1.1.2"),
         ("environmental", "1.0.1"),
@@ -758,14 +758,14 @@
         ("task_event", "1.0.3"),
         ("telemetry", "1.0.0"),
         ("update", "1.0.2"),
-    )
+    ])
 
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--registries",
         type=str,
         default="privilege,openbmc,"
-        + ",".join([dmtf[0] for dmtf in dmtf_registries]),
+        + ",".join([dmtf for dmtf in dmtf_registries]),
         help="Comma delimited list of registries to update",
     )
 
@@ -773,8 +773,9 @@
 
     registries = set(args.registries.split(","))
     files = []
+    registries_map = OrderedDict()
 
-    for registry, version in dmtf_registries:
+    for registry, version in dmtf_registries.items():
         if registry in registries:
             registry_pascal_case = to_pascal_case(registry)
             files.append(
@@ -784,31 +785,37 @@
                     registry,
                 )
             )
+            registries_map[registry] = files[-1]
     if "openbmc" in registries:
         files.append(openbmc_local_getter())
 
     update_registries(files)
 
-    create_error_registry(
-        files[0], dmtf_registries[0][1], "Base", "base", "error"
-    )
-    create_error_registry(
-        files[5],
-        dmtf_registries[5][1],
-        "HeartbeatEvent",
-        "heartbeat_event",
-        "heartbeat",
-    )
-    create_error_registry(
-        files[12],
-        dmtf_registries[12][1],
-        "ResourceEvent",
-        "resource_event",
-        "resource",
-    )
-    create_error_registry(
-        files[15], dmtf_registries[15][1], "TaskEvent", "task_event", "task"
-    )
+    if "base" in registries_map:
+        create_error_registry(
+            registries_map["base"], dmtf_registries["base"], "Base", "base", "error"
+        )
+    if "heartbeat_event" in registries_map:
+        create_error_registry(
+            registries_map["heartbeat_event"],
+            dmtf_registries["heartbeat_event"],
+            "HeartbeatEvent",
+            "heartbeat_event",
+            "heartbeat",
+        )
+    if "resource_event" in registries_map:
+        create_error_registry(
+            registries_map["resource_event"],
+            dmtf_registries["resource_event"],
+            "ResourceEvent",
+            "resource_event",
+            "resource",
+        )
+    if "task_event" in registries_map:
+        create_error_registry(
+            registries_map["task_event"], dmtf_registries["task_event"], "TaskEvent", "task_event", "task"
+        )
+
 
     if "privilege" in registries:
         make_privilege_registry()