Move to 2020.2
Point update_schemas.py at 2020.2 and run the script.
An overview of 2020.2 can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.2_Overview.pdf
Tested: Loaded on a Witherspoon and ran the validator.
See the new schemas.
Change-Id: Idb6cbc58efe484dcffa0cc22deff3a4746af67ed
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/schema/CertificateService_v1.xml b/static/redfish/v1/schema/CertificateService_v1.xml
index 262caa8..e66d344 100644
--- a/static/redfish/v1/schema/CertificateService_v1.xml
+++ b/static/redfish/v1/schema/CertificateService_v1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: CertificateService v1.0.2 -->
+<!--# Redfish Schema: CertificateService v1.0.3 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
@@ -39,8 +39,8 @@
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<EntityType Name="CertificateService" BaseType="Resource.v1_0_0.Resource" Abstract="true">
- <Annotation Term="OData.Description" String="The CertificateService schema describes a Certificate Service that represents the actions available to manage certificates and links to the certificates."/>
- <Annotation Term="OData.LongDescription" String="This Resource shall represent the Certificate Service properties for a Redfish implementation."/>
+ <Annotation Term="OData.Description" String="The CertificateService schema describes a certificate service that represents the actions available to manage certificates and links to the certificates."/>
+ <Annotation Term="OData.LongDescription" String="This resource shall represent the certificate service properties for a Redfish implementation."/>
<Annotation Term="Capabilities.InsertRestrictions">
<Record>
<PropertyValue Property="Insertable" Bool="false"/>
@@ -64,6 +64,8 @@
</EntityType>
<Action Name="GenerateCSR" IsBound="true">
+ <Annotation Term="OData.Description" String="This action makes a certificate signing request."/>
+ <Annotation Term="OData.LongDescription" String="This action shall make a certificate signing request. The response shall contain a signing request that a certificate authority (CA) must sign. The service should retain the private key that was generated during this request for installation of the certificate. The private key should not be part of the response."/>
<Parameter Name="CertificateService" Type="CertificateService.v1_0_0.Actions"/>
<Parameter Name="CommonName" Type="Edm.String" Nullable="false">
<Annotation Term="OData.Description" String="The fully qualified domain name of the component to secure."/>
@@ -110,12 +112,12 @@
<Annotation Term="OData.LongDescription" String="This parameter shall contain the curve ID to use with the key, if needed based on the KeyPairAlgorithm parameter value. The allowable values for this parameter shall be the strings in the 'Name' field of the 'TPM_ECC_CURVE Constants' table within the 'Trusted Computing Group Algorithm Registry'."/>
</Parameter>
<Parameter Name="CertificateCollection" Type="CertificateCollection.CertificateCollection" Nullable="false">
- <Annotation Term="OData.Description" String="The URI of the Certificate Resource Collection where the certificate is installed after the certificate authority (CA) signs the certificate."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall contain the URI of the Certificate Resource Collection where the certificate is installed after the certificate authority (CA) signs the certificate."/>
+ <Annotation Term="OData.Description" String="The link to the certificate collection where the certificate is installed after the certificate authority (CA) signs the certificate."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource collection of type CertificateCollection where the certificate is installed after the certificate authority (CA) signs the certificate."/>
</Parameter>
<Parameter Name="KeyUsage" Type="Collection(Certificate.KeyUsage)">
<Annotation Term="OData.Description" String="The usage of the key contained in the certificate."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall contain the usage of the key contained in the certificate. If the client does not provide this value, the service may determine the appropriate key usage settings in the certificate signing request."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the usage of the key contained in the certificate. If the client does not provide this value, the service can determine the appropriate key usage settings in the certificate signing request."/>
</Parameter>
<Parameter Name="Surname" Type="Edm.String">
<Annotation Term="OData.Description" String="The surname of the user making the request."/>
@@ -142,11 +144,11 @@
<Annotation Term="OData.LongDescription" String="This property shall contain the name of the user making the request, as defined by the RFC5280 'name' attribute."/>
</Parameter>
<ReturnType Type="CertificateService.v1_0_0.GenerateCSRResponse" Nullable="false"/>
- <Annotation Term="OData.Description" String="This action makes a certificate signing request."/>
- <Annotation Term="OData.LongDescription" String="This action shall make a certificate signing request. The response shall contain a signing request that a certificate authority (CA) must sign. The Service should retain the private key that was generated during this request for installation of the certificate. The private key should not be part of the response."/>
</Action>
<Action Name="ReplaceCertificate" IsBound="true">
+ <Annotation Term="OData.Description" String="This action replaces a certificate."/>
+ <Annotation Term="OData.LongDescription" String="This action shall replace a certificate. The `Location` header in the response shall contain the URI of the new certificate resource."/>
<Parameter Name="CertificateService" Type="CertificateService.v1_0_0.Actions"/>
<Parameter Name="CertificateString" Type="Edm.String" Nullable="false">
<Annotation Term="OData.Description" String="The string for the certificate."/>
@@ -158,10 +160,8 @@
</Parameter>
<Parameter Name="CertificateUri" Type="Certificate.Certificate" Nullable="false">
<Annotation Term="OData.Description" String="The link to the certificate that is being replaced."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall contain the URI of the Certificate Resource that is being replaced."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource of type Certificate that is being replaced."/>
</Parameter>
- <Annotation Term="OData.Description" String="This action replaces a certificate."/>
- <Annotation Term="OData.LongDescription" String="This action shall replace a certificate. The Location header in the response shall contain the URI of the new Certificate Resource."/>
</Action>
</Schema>
@@ -171,31 +171,31 @@
<EntityType Name="CertificateService" BaseType="CertificateService.CertificateService">
<Property Name="Actions" Type="CertificateService.v1_0_0.Actions" Nullable="false">
- <Annotation Term="OData.Description" String="The available actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
</Property>
<NavigationProperty Name="CertificateLocations" Type="CertificateLocations.CertificateLocations" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The information about the location of certificates."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the link to a Resource of type CertificateLocations."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type CertificateLocations."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</EntityType>
<ComplexType Name="Actions">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
- <Annotation Term="OData.Description" String="The available actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
<Property Name="Oem" Type="CertificateService.v1_0_0.OemActions" Nullable="false">
- <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
</Property>
</ComplexType>
<ComplexType Name="OemActions">
<Annotation Term="OData.AdditionalProperties" Bool="true"/>
- <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
</ComplexType>
<ComplexType Name="GenerateCSRResponse">
@@ -204,8 +204,8 @@
<Annotation Term="OData.LongDescription" String="This type shall contain the properties found in the response body for the GenerateCSR action."/>
<NavigationProperty Name="CertificateCollection" Type="CertificateCollection.CertificateCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The link to the Certificate Resource Collection where the certificate is installed."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the URI of the Certificate Resource Collection where the certificate is installed after the certificate authority (CA) has signed the certificate."/>
+ <Annotation Term="OData.Description" String="The link to the certificate collection where the certificate is installed."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection where the certificate is installed after the certificate authority (CA) has signed the certificate."/>
<Annotation Term="Redfish.Required"/>
</NavigationProperty>
<Property Name="CSRString" Type="Edm.String" Nullable="false">
@@ -229,5 +229,11 @@
<EntityType Name="CertificateService" BaseType="CertificateService.v1_0_1.CertificateService"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CertificateService.v1_0_3">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+ <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_2.CertificateService"/>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>