From 141d943157442558a78f8d4b06328d849d6df5e5 Mon Sep 17 00:00:00 2001
From: Sui Chen <suichen@google.com>
Date: Thu, 3 Feb 2022 22:01:27 -0800
Subject: Update schema pack to 2021.4

Update the script to point to 2021.4.

Tested: built for evb-ast2500, ran Redfish Service Validator:
                             BASE    2021.4
metadataNamespaces:          2330      2388
pass:                        3239      3249
passAction:                     8         8
passGet:                      120       121
passRedfishUri:               114       115
skipNoSchema:                   3         3
skipOptional:                2180      2184
unverifiedAdditional.complex:   2         0
warnDeprecated:               315       315
warningPresent:                12        11
Validation has:         succeeded succeeded

Saw new schemas:
curl -k https://$bmc/redfish/v1/JsonSchemas/Manager/Manager.json
...
    "title": "#Manager.v1_14_0.Manager"
}

Signed-off-by: Sui Chen <suichen@google.com>
Change-Id: I6560ec010362df28e264d80452059b534b3f89ba
---
 static/redfish/v1/schema/Settings_v1.xml | 33 ++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'static/redfish/v1/schema/Settings_v1.xml')

diff --git a/static/redfish/v1/schema/Settings_v1.xml b/static/redfish/v1/schema/Settings_v1.xml
index 209dce047b..06ecde6844 100644
--- a/static/redfish/v1/schema/Settings_v1.xml
+++ b/static/redfish/v1/schema/Settings_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Settings v1.3.3                                                     -->
+<!--# Redfish Schema:  Settings v1.3.4                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -168,7 +168,7 @@
         <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The start time of a maintenance window."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the future configuration as part of a maintenance window.  This property shall be required if the ApplyTime property is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the future configuration as part of a maintenance window.  Services shall provide a default value if not configured by a user.  This property shall be required if the ApplyTime property is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
         </Property>
         <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -234,6 +234,13 @@
       <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_4.PreferredApplyTime"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_1_5.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_5.PreferredApplyTime"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -260,7 +267,7 @@
         <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The start time of a maintenance window."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the same as the MaintenanceWindowStartTime property found in the MaintenanceWindow structure on the MaintenanceWindowResource.  This property shall be required if the SupportedValues property contains `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the same as the MaintenanceWindowStartTime property found in the MaintenanceWindow structure on the MaintenanceWindowResource.  Services shall provide a default value if not configured by a user.  This property shall be required if the SupportedValues property contains `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
         </Property>
         <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -282,7 +289,7 @@
         <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The start time of a maintenance window."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the requested settings or operation as part of a maintenance window."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the requested settings or operation as part of a maintenance window.  Services shall provide a default value if not configured by a user."/>
           <Annotation Term="Redfish.Required"/>
         </Property>
         <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false">
@@ -341,6 +348,15 @@
       <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_4.MaintenanceWindow"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_2_5.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_2_5.PreferredApplyTime"/>
+      <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_2_5.OperationApplyTimeSupport"/>
+      <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_5.MaintenanceWindow"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -379,5 +395,14 @@
       <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_2.MaintenanceWindow"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_3_3.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_3_3.PreferredApplyTime"/>
+      <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_3_3.OperationApplyTimeSupport"/>
+      <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_3.MaintenanceWindow"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
-- 
cgit v1.2.3