commit 09b9d45e5426631ff38a5665c652eb9e76643706
author Gunnar Mills <gmills@us.ibm.com> Tue Feb 11 13:27:39 2020 -0600
committer Gunnar Mills <gmills@us.ibm.com> Thu Feb 13 13:30:36 2020 -0600
tree 422a2f07bdbf10b27a19210d2933e62bf0f4dfc5
parent 86a0851afa06adb728c00658bbf8cd8608bd8ff3

Move to 2019.4

Make changes to update_schemas.py needed for the move and run
update_schemas.py.

To see an overview of 2019.4 see
https://www.dmtf.org/sites/default/files/Redfish_Release_2019.4_Overview.pdf

Tested: Built bmcweb, loaded on a Witherspoon, and ran
        the validator. No errors.

See new schemas:
 curl -k https://${bmc}/redfish/v1/JsonSchemas/VCATEntry
{
    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
    "@odata.id": "/redfish/v1/JsonSchemas/VCATEntry",
    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
    "Name": "VCATEntry Schema File",
    "Schema": "#VCATEntry.VCATEntry",

Change-Id: I5ae6e3c655e44c82c4457515555bdb934dfb7763
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

scripts/update_schemas.py

diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 3e8529b..d576179 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -12,7 +12,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2019.3"
+VERSION = "DSP8010_2019.4"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -65,8 +65,12 @@
 
     for zip_filepath in zip_ref.namelist():
         if zip_filepath.startswith(VERSION +
+                                   '/' +
+                                   VERSION +
                                    '/csdl/') & (zip_filepath != VERSION +
                                                 "/csdl/") & (zip_filepath != VERSION +
+                                                             '/' +
+                                                             VERSION +
                                                              "/csdl/"):
             filename = os.path.basename(zip_filepath)
             with open(os.path.join(schema_path, filename), 'wb') as schema_file:
@@ -137,7 +141,7 @@
 
 schema_files = {}
 for zip_filepath in zip_ref.namelist():
-    if zip_filepath.startswith(os.path.join(VERSION, 'json-schema/')):
+    if zip_filepath.startswith(os.path.join(VERSION, VERSION, 'json-schema/')):
         filename = os.path.basename(zip_filepath)
         filenamesplit = filename.split(".")
         if len(filenamesplit) == 3:
@@ -153,7 +157,7 @@
 
 for schema, version in schema_files.items():
     basename = schema + "." + version + ".json"
-    zip_filepath = os.path.join(VERSION, "json-schema", basename)
+    zip_filepath = os.path.join(VERSION, VERSION, "json-schema", basename)
     schemadir = os.path.join(json_schema_path, schema)
     os.makedirs(schemadir)
     location_json = OrderedDict()