commit 9a70ffcd8ee1f0a8cc15ed8691b8fa05f422548f
author Myung Bae <myungbae@us.ibm.com> Sat Jun 21 13:47:46 2025 -0500
committer Ed Tanous <ed@tanous.net> Wed Jun 25 15:38:10 2025 +0000
tree 8cc9dde86466174ecd31a56afa55061a53ca5906
parent 04c39938e1ecb9d249a425039b5684da78db382a

Fix json-schema-installed version during schema update

This fixes `update_schemas.py` so that the existing installed csdl and
json symlinks are to be kept and also to be updated with the matching
json schema version when DMTF schema version is upgraded.

This commit also uses the symlinks to the closed relative paths like
- `../schema/dmtf/installed/<schema>.xml -> ../csdl/<schema>.xml`
- `../schema/dmtf/json-schema-installed/<json-file>.json ->
  ../json-schema/<json-file>.json`

Tested:
 - Change VERSION in `update_schemas.py` and verify the generated files
 - CI passes
 - Redfish Service Validator passes

Change-Id: Ib7fede7e4c39bdfc13da227eb1e737d96b6c2b5e
Signed-off-by: Myung Bae <myungbae@us.ibm.com>

scripts/update_schemas.py

diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 85eb23c..20dfefa 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -33,6 +33,10 @@
     redfish_core_path, "schema", "dmtf", "json-schema"
 )
 
+# installed csdl/json symlinks
+schema_installed_path = os.path.join(schema_path, "..", "installed")
+json_schema_installed_path = json_schema_path + "-installed"
+
 zipBytesIO = BytesIO(r.content)
 zip_ref = zipfile.ZipFile(zipBytesIO)
 
@@ -95,13 +99,37 @@
     sorted(json_schema_files.items(), key=lambda x: SchemaVersion(x[0]))
 )
 
+# Get the currently-installed csdl
+csdl_installed_symlinks = set()
+for csdl_symlink in os.listdir(schema_installed_path):
+    csdl_installed_symlinks.add(csdl_symlink)
 
+shutil.rmtree(schema_installed_path)
+os.makedirs(schema_installed_path)
+
+# Create csdl files & keep the updated csdl-installed symlinks
 for csdl_file in csdl_filenames:
     with open(os.path.join(schema_path, csdl_file), "wb") as schema_out:
         content = zip_ref.read(os.path.join(VERSION + "/csdl", csdl_file))
         content = content.replace(b"\r\n", b"\n")
         schema_out.write(content)
 
+    if csdl_file in csdl_installed_symlinks:
+        os.symlink(
+            os.path.join("..", "csdl", csdl_file),
+            os.path.join(schema_installed_path, csdl_file),
+        )
+
+# Get the currently-installed json symlinks
+json_base_symlinks = defaultdict(list)
+for json_symlink in os.listdir(json_schema_installed_path):
+    base_json_name = json_symlink.split(".")[0]
+    json_base_symlinks[base_json_name].append(json_symlink)
+
+shutil.rmtree(json_schema_installed_path)
+os.makedirs(json_schema_installed_path)
+
+# Create json files & keep the installed json symlinks
 for schema_filename, versions in json_schema_files.items():
     zip_filepath = os.path.join(VERSION + "/json-schema", versions[0])
 
@@ -112,6 +140,12 @@
         content = content.replace(b"\r\n", b"\n")
         schema_file.write(content)
 
+    if schema_filename in json_base_symlinks:
+        os.symlink(
+            os.path.join("..", "json-schema", versions[0]),
+            os.path.join(json_schema_installed_path, versions[0]),
+        )
+
 zip_ref.close()
 
 generate_schema_enums.main()