commit 852432ac8640c0c5e54d72acaa7dc615b604eef7
author Ed Tanous <edtanous@google.com> Thu Jul 07 14:32:37 2022 -0700
committer Ed Tanous <ed@tanous.net> Sun Jul 31 23:05:10 2022 +0000
tree 5ce7eb170e9025b8bc726aad7281181115040129
parent 5b224921d765a93c5f93a6012109a9a748ef7cd4

Include Collections for JsonSchema resources

Redfish collection Json schema files are not versioned, and only have a
single version file.  In the script, we assumed that all files were
versioned, and the script ignored files that didn't parse as versioned.

This commit fixes the script, and checks in the relevant Collection
resources.

Tested: Redfish service validator passes on JsonSchemas resources and
collection.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I579dac3fdfecf485f7d414842effa9ae0ee517e8

scripts/update_schemas.py

diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 85cb71d..d1c93bc 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -302,10 +302,17 @@
                 if list(map(int, filenamesplit[1][1:].split("_"))) > list(map(
                         int, thisSchemaVersion[1:].split("_"))):
                     schema_files[filenamesplit[0]] = filenamesplit[1]
-
+        else:
+            # Unversioned schema include directly.  Invent a version so it can
+            # still be sorted against
+            schema_files[filenamesplit[0]] = "v0_0_0"
 
 for schema, version in schema_files.items():
-    basename = schema + "." + version + ".json"
+    basename = schema
+    if version != "v0_0_0":
+        basename += "." + version
+    basename += ".json"
+
     zip_filepath = os.path.join("json-schema", basename)
     schemadir = os.path.join(json_schema_path, schema)
     os.makedirs(schemadir)