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>
diff --git a/static/redfish/v1/schema/EventService_v1.xml b/static/redfish/v1/schema/EventService_v1.xml
index 86f9928..30729e8 100644
--- a/static/redfish/v1/schema/EventService_v1.xml
+++ b/static/redfish/v1/schema/EventService_v1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: EventService v1.4.0 -->
+<!--# Redfish Schema: EventService v1.5.0 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
@@ -26,6 +26,7 @@
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
<edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+ <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Event_v1.xml">
<edmx:Include Namespace="Event"/>
@@ -416,5 +417,107 @@
</ComplexType>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="2019.3"/>
+
+ <EntityType Name="EventService" BaseType="EventService.v1_4_0.EventService">
+ <Property Name="SMTP" Type="EventService.v1_5_0.SMTP" Nullable="false">
+ <Annotation Term="OData.Description" String="Settings for SMTP event delivery."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain settings for SMTP event delivery."/>
+ </Property>
+ </EntityType>
+
+ <ComplexType Name="SMTP">
+ <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+ <Annotation Term="OData.Description" String="Settings for SMTP event delivery."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain settings for SMTP event delivery."/>
+ <Property Name="ServiceEnabled" Type="Edm.Boolean">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="An indication if SMTP for event delivery is enabled."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate if SMTP for event delivery is enabled."/>
+ </Property>
+ <Property Name="Port" Type="Edm.Int64">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The destination SMTP port."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the destination port for the SMTP server."/>
+ <Annotation Term="Validation.Minimum" Int="0"/>
+ <Annotation Term="Validation.Maximum" Int="65535"/>
+ </Property>
+ <Property Name="ServerAddress" Type="Edm.String">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The address of the SMTP server."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the address of the SMTP server for outgoing email."/>
+ </Property>
+ <Property Name="FromAddress" Type="Edm.String">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The 'from' email address of the outgoing email."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the email address to use for the 'from' field in an outgoing email."/>
+ </Property>
+ <Property Name="ConnectionProtocol" Type="EventService.v1_5_0.SMTPConnectionProtocol">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The connection type to the outgoing SMTP server."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the connection type to the outgoing SMTP server."/>
+ </Property>
+ <Property Name="Authentication" Type="EventService.v1_5_0.SMTPAuthenticationMethods">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The authentication method for the SMTP server."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the authentication method for the SMTP server."/>
+ </Property>
+ <Property Name="Username" Type="Edm.String">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The username for authentication with the SMTP server."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the username for authentication with the SMTP server."/>
+ </Property>
+ <Property Name="Password" Type="Edm.String">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="The password for authentication with the SMTP server. The value is `null` in responses."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the password for authentication with the SMTP server. The value shall be `null` in responses."/>
+ </Property>
+ </ComplexType>
+
+ <EnumType Name="SMTPConnectionProtocol">
+ <Member Name="None">
+ <Annotation Term="OData.Description" String="Clear text."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is in clear text."/>
+ </Member>
+ <Member Name="AutoDetect">
+ <Annotation Term="OData.Description" String="Auto-detect."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is auto-detected."/>
+ </Member>
+ <Member Name="StartTLS">
+ <Annotation Term="OData.Description" String="StartTLS."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate the connection conforms to the RFC3207-defined StartTLS extension."/>
+ </Member>
+ <Member Name="TLS_SSL">
+ <Annotation Term="OData.Description" String="TLS/SSL."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is TLS/SSL."/>
+ </Member>
+ </EnumType>
+
+ <EnumType Name="SMTPAuthenticationMethods">
+ <Member Name="None">
+ <Annotation Term="OData.Description" String="No authentication."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is not required."/>
+ </Member>
+ <Member Name="AutoDetect">
+ <Annotation Term="OData.Description" String="Auto-detect."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is auto-detected."/>
+ </Member>
+ <Member Name="Plain">
+ <Annotation Term="OData.Description" String="PLAIN authentication."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH PLAIN mechanism."/>
+ </Member>
+ <Member Name="Login">
+ <Annotation Term="OData.Description" String="LOGIN authentication."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH LOGIN mechanism."/>
+ </Member>
+ <Member Name="CRAM_MD5">
+ <Annotation Term="OData.Description" String="CRAM-MD5 authentication."/>
+ <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH CRAM-MD5 mechanism."/>
+ </Member>
+ </EnumType>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>