commit 6f44b7524f1d48d009ec87b1309481c7905b13b4
author Gunnar Mills <gmills@us.ibm.com> Thu Feb 06 16:50:51 2020 -0600
committer Gunnar Mills <gmills@us.ibm.com> Mon Feb 10 18:34:00 2020 +0000
tree 7aa5967a130150ab30989758925d444936d59d73
parent 42cbe53889b5f2d358d1174245df51a23efcb3f8

Move to 2019.3

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

old path (2019.2)
DSP8010_2019.2/DSP8010_2019.2/json-schema/MemoryMetrics.v1_1_2.json
DSP8010_2019.2/DSP8010_2019.2/openapi/Memory.v1_0_3.yaml
DSP8010_2019.2/DSP8010_2019.2/csdl/AccelerationFunction_v1.xml

new path (2019.3)
DSP8010_2019.3/csdl/Memory_v1.xml
DSP8010_2019.3/json-schema/UpdateService.v1_1_2.json
DSP8010_2019.3/openapi/Zone.v1_3_1.yaml

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

Tested: Built bmcweb, loaded on a Witherspoon, and ran
        the validator. No errors.
Change-Id: I0deaf88b884d65fffa31fcf66183ed61a930a073
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 01ab66c..3e8529b 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -12,7 +12,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2019.2"
+VERSION = "DSP8010_2019.3"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -65,12 +65,8 @@
 
     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:
@@ -141,7 +137,7 @@
 
 schema_files = {}
 for zip_filepath in zip_ref.namelist():
-    if zip_filepath.startswith(os.path.join(VERSION, VERSION, 'json-schema/')):
+    if zip_filepath.startswith(os.path.join(VERSION, 'json-schema/')):
         filename = os.path.basename(zip_filepath)
         filenamesplit = filename.split(".")
         if len(filenamesplit) == 3:
@@ -157,7 +153,7 @@
 
 for schema, version in schema_files.items():
     basename = schema + "." + version + ".json"
-    zip_filepath = os.path.join(VERSION, VERSION, "json-schema", basename)
+    zip_filepath = os.path.join(VERSION, "json-schema", basename)
     schemadir = os.path.join(json_schema_path, schema)
     os.makedirs(schemadir)
     location_json = OrderedDict()