Move to 2020.3
Run the script update_schemas.py by pointing it to 2020.3
An overview of 2020.3 release can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.3_Overview.pdf
Tested: Loaded on a Witherspoon and Validator passed with the latest schemas
Signed-off-by: Asmitha Karunanithi <asmitk01@in.ibm.com>
Change-Id: I6c7a2e0cbdbe599930ba453a1d8c134c22136306
diff --git a/static/redfish/v1/JsonSchemas/LogService/LogService.json b/static/redfish/v1/JsonSchemas/LogService/LogService.json
index c933052..9d44ac8 100644
--- a/static/redfish/v1/JsonSchemas/LogService/LogService.json
+++ b/static/redfish/v1/JsonSchemas/LogService/LogService.json
@@ -1,8 +1,8 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/LogService.v1_1_3.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/LogService.v1_2_0.json",
"$ref": "#/definitions/LogService",
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
- "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
"definitions": {
"Actions": {
"additionalProperties": false,
@@ -26,6 +26,9 @@
"#LogService.ClearLog": {
"$ref": "#/definitions/ClearLog"
},
+ "#LogService.CollectDiagnosticData": {
+ "$ref": "#/definitions/CollectDiagnosticData"
+ },
"Oem": {
"$ref": "#/definitions/OemActions",
"description": "The available OEM-specific actions for this Resource.",
@@ -66,6 +69,66 @@
},
"type": "object"
},
+ "CollectDiagnosticData": {
+ "additionalProperties": false,
+ "description": "The action to collect the diagnostic data for the given type.",
+ "longDescription": "This action shall collect the diagnostic data for the given type. The `Location` header in the response shall contain a URI to a resource of type LogEntry that contains the diagnostic data.",
+ "parameters": {
+ "DiagnosticDataType": {
+ "$ref": "#/definitions/LogDiagnosticDataTypes",
+ "description": "The type of diagnostic data to collect.",
+ "longDescription": "This parameter shall contain the type of diagnostic data to collect.",
+ "requiredParameter": true
+ },
+ "OEMDiagnosticDataType": {
+ "description": "The OEM-defined type of diagnostic data to collect.",
+ "longDescription": "This parameter shall contain the OEM-defined type of diagnostic data to collect. This parameter shall be required if DiagnosticDataType is `OEM`.",
+ "type": "string"
+ }
+ },
+ "patternProperties": {
+ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+ "description": "This property shall specify a valid odata or Redfish property.",
+ "type": [
+ "array",
+ "boolean",
+ "integer",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {
+ "target": {
+ "description": "Link to invoke action",
+ "format": "uri-reference",
+ "type": "string"
+ },
+ "title": {
+ "description": "Friendly action name",
+ "type": "string"
+ }
+ },
+ "type": "object",
+ "versionAdded": "v1_2_0"
+ },
+ "LogDiagnosticDataTypes": {
+ "enum": [
+ "Manager",
+ "PreOS",
+ "OS",
+ "OEM"
+ ],
+ "enumDescriptions": {
+ "Manager": "Manager diagnostic data.",
+ "OEM": "OEM diagnostic data.",
+ "OS": "Operating system (OS) diagnostic data.",
+ "PreOS": "Pre-OS diagnostic data."
+ },
+ "type": "string"
+ },
"LogEntryTypes": {
"enum": [
"Event",
@@ -207,6 +270,22 @@
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
"description": "The status and health of the Resource and its subordinate or dependent Resources.",
"longDescription": "This property shall contain any status or health properties of the Resource."
+ },
+ "SyslogFilters": {
+ "description": "A list of syslog message filters to be logged locally.",
+ "items": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SyslogFilter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "longDescription": "This property shall describe all desired syslog messages to be logged locally. If this property contains an empty array, all messages shall be logged.",
+ "type": "array",
+ "versionAdded": "v1_2_0"
}
},
"required": [
@@ -250,9 +329,146 @@
"WrapsWhenFull": "When full, new entries to the log overwrite earlier entries."
},
"type": "string"
+ },
+ "SyslogFacility": {
+ "description": "The syslog facility code is an enumeration of program types.",
+ "enum": [
+ "Kern",
+ "User",
+ "Mail",
+ "Daemon",
+ "Auth",
+ "Syslog",
+ "LPR",
+ "News",
+ "UUCP",
+ "Cron",
+ "Authpriv",
+ "FTP",
+ "NTP",
+ "Security",
+ "Console",
+ "SolarisCron",
+ "Local0",
+ "Local1",
+ "Local2",
+ "Local3",
+ "Local4",
+ "Local5",
+ "Local6",
+ "Local7"
+ ],
+ "enumDescriptions": {
+ "Auth": "Security/authentication messages.",
+ "Authpriv": "Security/authentication messages.",
+ "Console": "Log alert.",
+ "Cron": "Clock daemon.",
+ "Daemon": "System daemons.",
+ "FTP": "FTP daemon.",
+ "Kern": "Kernel messages.",
+ "LPR": "Line printer subsystem.",
+ "Local0": "Locally used facility 0.",
+ "Local1": "Locally used facility 1.",
+ "Local2": "Locally used facility 2.",
+ "Local3": "Locally used facility 3.",
+ "Local4": "Locally used facility 4.",
+ "Local5": "Locally used facility 5.",
+ "Local6": "Locally used facility 6.",
+ "Local7": "Locally used facility 7.",
+ "Mail": "Mail system.",
+ "NTP": "NTP subsystem.",
+ "News": "Network news subsystem.",
+ "Security": "Log audit.",
+ "SolarisCron": "Scheduling daemon.",
+ "Syslog": "Messages generated internally by syslogd.",
+ "UUCP": "UUCP subsystem.",
+ "User": "User-level messages."
+ },
+ "longDescription": "This type shall specify the syslog facility codes as program types. Facility values are described in the RFC5424.",
+ "type": "string"
+ },
+ "SyslogFilter": {
+ "additionalProperties": false,
+ "description": "A syslog filter.",
+ "longDescription": "This type shall contain the filter for a syslog message. The filter shall describe the desired syslog message to be enabled locally.",
+ "patternProperties": {
+ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+ "description": "This property shall specify a valid odata or Redfish property.",
+ "type": [
+ "array",
+ "boolean",
+ "integer",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {
+ "LogFacilities": {
+ "description": "The types of programs that can log messages.",
+ "items": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SyslogFacility"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "longDescription": "This property shall contain the types of programs that can log messages. If this property contains an empty array or is absent, all facilities shall be indicated.",
+ "readonly": false,
+ "type": "array",
+ "versionAdded": "v1_2_0"
+ },
+ "LowestSeverity": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SyslogSeverity"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "description": "The lowest severity level message that will be logged.",
+ "longDescription": "This property shall contain the lowest syslog severity level that will be logged. The service shall log all messages equal to or greater than the value in this property. The value `All` shall indicate all severities.",
+ "readonly": false,
+ "versionAdded": "v1_2_0"
+ }
+ },
+ "type": "object"
+ },
+ "SyslogSeverity": {
+ "description": "The syslog severity is an application-specific rating used to describe the urgency of the message.",
+ "enum": [
+ "Emergency",
+ "Alert",
+ "Critical",
+ "Error",
+ "Warning",
+ "Notice",
+ "Informational",
+ "Debug",
+ "All"
+ ],
+ "enumDescriptions": {
+ "Alert": "A condition that should be corrected immediately, such as a corrupted system database.",
+ "All": "A message of any severity.",
+ "Critical": "Hard device errors.",
+ "Debug": "Messages that contain information normally of use only when debugging a program.",
+ "Emergency": "A panic condition.",
+ "Error": "An Error.",
+ "Informational": "Informational only.",
+ "Notice": "Conditions that are not error conditions, but that may require special handling.",
+ "Warning": "A Warning."
+ },
+ "longDescription": "This type shall specify the syslog severity levels as an application-specific rating used to describe the urgency of the message. `Emergency` should be reserved for messages indicating the system is unusable and `Debug` should only be used when debugging a program. Severity values are described in RFC5424.",
+ "type": "string"
}
},
"owningEntity": "DMTF",
- "release": "2017.3",
- "title": "#LogService.v1_1_3.LogService"
+ "release": "2020.3",
+ "title": "#LogService.v1_2_0.LogService"
}
\ No newline at end of file