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>

static/redfish/v1/schema/ServiceRoot_v1.xml

diff --git a/static/redfish/v1/schema/ServiceRoot_v1.xml b/static/redfish/v1/schema/ServiceRoot_v1.xml
index ce0517f..ef2c4bd 100644
--- a/static/redfish/v1/schema/ServiceRoot_v1.xml
+++ b/static/redfish/v1/schema/ServiceRoot_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ServiceRoot v1.5.2                                                  -->
+<!--# Redfish Schema:  ServiceRoot v1.6.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -82,6 +82,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ResourceBlockCollection_v1.xml">
     <edmx:Include Namespace="ResourceBlockCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/FacilityCollection_v1.xml">
+    <edmx:Include Namespace="FacilityCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerEquipment_v1.xml">
+    <edmx:Include Namespace="PowerEquipment"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -582,5 +588,29 @@
       <EntityType Name="ServiceRoot" BaseType="ServiceRoot.v1_5_1.ServiceRoot"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ServiceRoot.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.4"/>
+
+      <EntityContainer Name="ServiceContainer" Extends="ServiceRoot.v1_5_0.ServiceContainer">
+        <Singleton Name="PowerEquipment" Type="PowerEquipment.PowerEquipment"/>
+        <Singleton Name="Facilities" Type="FacilityCollection.FacilityCollection"/>
+      </EntityContainer>
+
+      <EntityType Name="ServiceRoot" BaseType="ServiceRoot.v1_5_2.ServiceRoot">
+        <NavigationProperty Name="PowerEquipment" Type="PowerEquipment.PowerEquipment" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a set of power equipment."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type PowerEquipment."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Facilities" Type="FacilityCollection.FacilityCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of facilities."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type FacilityCollection."/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>