From ac0154a247412c5891fb61a95fea15a5fd170053 Mon Sep 17 00:00:00 2001 From: Anjaliintel-21 Date: Mon, 4 Apr 2022 20:54:29 +0000 Subject: [PATCH] Add MemoryMetrics schema file As reference URI for MemoryMetrics was missing, which was causing redfish validator to fail. So, added reference URI for MemoryMetrics in the index.xml file and also added "MemoryMetrics" in update_schemas.py file. Tested: *** /redfish/v1/Systems/system/Memory/dimm0/MemoryMetrics Type (#MemoryMetrics.v1_4_1.MemoryMetrics), GET SUCCESS (time: 1.315905) PASS Elapsed time: 0:03:35 Counter({'metadataNamespaces': 2337, 'skipOptional': 9, 'pass': 2, 'passGet': 1, 'serviceNamespaces': 1}) Validation has succeeded. Signed-off-by: Anjaliintel-21 --- scripts/update_schemas.py | 1 + static/redfish/v1/$metadata/index.xml | 28 ++ .../MemoryMetrics/MemoryMetrics.json | 473 ++++++++++++++++++ .../v1/JsonSchemas/MemoryMetrics/index.json | 21 + static/redfish/v1/JsonSchemas/index.json | 5 +- static/redfish/v1/schema/MemoryMetrics_v1.xml | 424 ++++++++++++++++ 6 files changed, 951 insertions(+), 1 deletion(-) create mode 100644 static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json create mode 100644 static/redfish/v1/JsonSchemas/MemoryMetrics/index.json create mode 100644 static/redfish/v1/schema/MemoryMetrics_v1.xml diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py index 3f0f57c..a233291 100755 --- a/scripts/update_schemas.py +++ b/scripts/update_schemas.py @@ -48,6 +48,7 @@ include_list = [ 'ManagerNetworkProtocol', 'Memory', 'MemoryCollection', + 'MemoryMetrics', 'Message', 'MessageRegistry', 'MessageRegistryCollection', diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml index 9b080f3..d7b9e08 100644 --- a/static/redfish/v1/$metadata/index.xml +++ b/static/redfish/v1/$metadata/index.xml @@ -1340,6 +1340,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json new file mode 100644 index 0000000..a841f07 --- /dev/null +++ b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json @@ -0,0 +1,473 @@ +{ + "$id": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.v1_4_1.json", + "$ref": "#/definitions/MemoryMetrics", + "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json", + "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright", + "definitions": { + "Actions": { + "additionalProperties": false, + "description": "The available actions for this resource.", + "longDescription": "This type shall contain the available actions for this resource.", + "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": { + "#MemoryMetrics.ClearCurrentPeriod": { + "$ref": "#/definitions/ClearCurrentPeriod" + }, + "Oem": { + "$ref": "#/definitions/OemActions", + "description": "The available OEM-specific actions for this resource.", + "longDescription": "This property shall contain the available OEM-specific actions for this resource." + } + }, + "type": "object" + }, + "AlarmTrips": { + "additionalProperties": false, + "description": "The alarm trip information about the memory. These alarms are reset when the system resets. Note that if they are re-discovered they can be reasserted.", + "longDescription": "This type shall contain properties that describe the types of alarms that have been raised by the memory. These alarms shall be reset when the system resets. Note that if they are re-discovered they can be reasserted.", + "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": { + "AddressParityError": { + "description": "An indication of whether an address parity error was detected that a retry could not correct.", + "longDescription": "This property shall indicate whether an address parity error was detected that a retry could not correct.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "CorrectableECCError": { + "description": "An indication of whether the correctable error threshold crossing alarm trip was detected.", + "longDescription": "This property shall indicate whether the correctable error threshold crossing alarm trip was detected.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "SpareBlock": { + "description": "An indication of whether the spare block capacity crossing alarm trip was detected.", + "longDescription": "This property shall indicate whether the spare block capacity crossing alarm trip was detected.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "Temperature": { + "description": "An indication of whether a temperature threshold alarm trip was detected.", + "longDescription": "This property shall indicates whether a temperature threshold alarm trip was detected.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "UncorrectableECCError": { + "description": "An indication of whether the uncorrectable error threshold alarm trip was detected.", + "longDescription": "This property shall indicate whether the uncorrectable error threshold alarm trip was detected.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + } + }, + "type": "object" + }, + "ClearCurrentPeriod": { + "additionalProperties": false, + "description": "This action sets the CurrentPeriod property's values to 0.", + "longDescription": "This action shall set the CurrentPeriod property's values to 0.", + "parameters": {}, + "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" + }, + "CurrentPeriod": { + "additionalProperties": false, + "description": "The memory metrics since the last system reset or ClearCurrentPeriod action.", + "longDescription": "This type shall describe the memory metrics since last system reset or ClearCurrentPeriod action.", + "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": { + "BlocksRead": { + "description": "The number of blocks read since reset.", + "longDescription": "This property shall contain the number of blocks read since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ] + }, + "BlocksWritten": { + "description": "The number of blocks written since reset.", + "longDescription": "This property shall contain the number of blocks written since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ] + }, + "CorrectableECCErrorCount": { + "description": "The number of the correctable errors since reset.", + "longDescription": "This property shall contain the number of correctable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "versionAdded": "v1_4_0" + }, + "UncorrectableECCErrorCount": { + "description": "The number of the uncorrectable errors since reset.", + "longDescription": "This property shall contain the number of uncorrectable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "versionAdded": "v1_4_0" + } + }, + "type": "object" + }, + "HealthData": { + "additionalProperties": false, + "description": "The health information of the memory.", + "longDescription": "This type shall contain properties that describe the HealthData metrics for this resource.", + "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": { + "AlarmTrips": { + "$ref": "#/definitions/AlarmTrips", + "description": "Alarm trip information about the memory.", + "longDescription": "This object shall contain properties describe the types of alarms that have been raised by the memory. When this resource is subordinate to the MemorySummary object, this property shall indicate whether an alarm of a given type have been raised by any area of memory." + }, + "DataLossDetected": { + "description": "An indication of whether data loss was detected.", + "longDescription": "This property shall indicate whether data loss was detected. When this resource is subordinate to the MemorySummary object, this property shall indicate whether any data loss was detected in any area of memory.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "LastShutdownSuccess": { + "description": "An indication of whether the last shutdown succeeded.", + "longDescription": "This property shall indicate whether the last shutdown succeeded.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "PerformanceDegraded": { + "description": "An indication of whether performance has degraded.", + "longDescription": "This property shall indicate whether performance has degraded. When this resource is subordinate to the MemorySummary object, this property shall indicate whether degraded performance mode status is detected in any area of memory.", + "readonly": true, + "type": [ + "boolean", + "null" + ] + }, + "PredictedMediaLifeLeftPercent": { + "description": "The percentage of reads and writes that are predicted to still be available for the media.", + "longDescription": "This property shall contain an indicator of the percentage of life remaining in the media.", + "readonly": true, + "type": [ + "number", + "null" + ], + "units": "%", + "versionAdded": "v1_1_0" + }, + "RemainingSpareBlockPercentage": { + "description": "The remaining spare blocks, as a percentage.", + "longDescription": "This property shall contain the remaining spare blocks as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the RemainingSpareBlockPercentage over all memory.", + "readonly": true, + "type": [ + "number", + "null" + ], + "units": "%" + } + }, + "type": "object" + }, + "LifeTime": { + "additionalProperties": false, + "description": "The memory metrics for the lifetime of the memory.", + "longDescription": "This type shall describe the memory metrics since manufacturing.", + "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": { + "BlocksRead": { + "description": "The number of blocks read for the lifetime of the memory.", + "longDescription": "This property shall contain the number of blocks read for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ] + }, + "BlocksWritten": { + "description": "The number of blocks written for the lifetime of the memory.", + "longDescription": "This property shall contain the number of blocks written for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ] + }, + "CorrectableECCErrorCount": { + "description": "The number of the correctable errors for the lifetime of the memory.", + "longDescription": "This property shall contain the number of the correctable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "versionAdded": "v1_4_0" + }, + "UncorrectableECCErrorCount": { + "description": "The number of the uncorrectable errors for the lifetime of the memory.", + "longDescription": "This property shall contain the number of the uncorrectable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "versionAdded": "v1_4_0" + } + }, + "type": "object" + }, + "MemoryMetrics": { + "additionalProperties": false, + "description": "The usage and health statistics for a memory device or system memory summary.", + "longDescription": "The MemoryMetrics schema shall contain the memory metrics for a memory device or system memory summary in a Redfish implementation.", + "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": { + "@odata.context": { + "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context" + }, + "@odata.etag": { + "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag" + }, + "@odata.id": { + "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id" + }, + "@odata.type": { + "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type" + }, + "Actions": { + "$ref": "#/definitions/Actions", + "description": "The available actions for this resource.", + "longDescription": "This property shall contain the available actions for this resource." + }, + "BandwidthPercent": { + "description": "The memory bandwidth utilization as a percentage.", + "longDescription": "This property shall contain memory bandwidth utilization as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the memory bandwidth utilization over all memory as a percentage.", + "minimum": 0, + "readonly": true, + "type": [ + "number", + "null" + ], + "units": "%", + "versionAdded": "v1_2_0" + }, + "BlockSizeBytes": { + "description": "The block size, in bytes.", + "longDescription": "This property shall contain the block size, in bytes, of all structure elements. When this resource is subordinate to the MemorySummary object, this property is not applicable.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "units": "By" + }, + "CurrentPeriod": { + "$ref": "#/definitions/CurrentPeriod", + "description": "The memory metrics since the last reset or ClearCurrentPeriod action.", + "longDescription": "This property shall contain properties that describe the memory metrics for the current period." + }, + "Description": { + "anyOf": [ + { + "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description" + }, + { + "type": "null" + } + ], + "readonly": true + }, + "HealthData": { + "$ref": "#/definitions/HealthData", + "description": "The health information of the memory.", + "longDescription": "This property shall contain properties that describe the health data memory metrics for the memory." + }, + "Id": { + "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id", + "readonly": true + }, + "LifeTime": { + "$ref": "#/definitions/LifeTime", + "description": "The memory metrics for the lifetime of the memory.", + "longDescription": "This property shall contain properties that describe the memory metrics for the lifetime of the memory." + }, + "Name": { + "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name", + "readonly": true + }, + "Oem": { + "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem", + "description": "The OEM extension property.", + "longDescription": "This property shall contain the OEM extensions. All values for properties that this object contains shall conform to the Redfish Specification-described requirements." + }, + "OperatingSpeedMHz": { + "description": "Operating speed of memory in MHz or MT/s as appropriate.", + "longDescription": "This property shall contain the operating speed of memory in MHz or MT/s (mega-transfers per second) as reported by the memory device. Memory devices that operate at their bus speed shall report the operating speed in MHz (bus speed), while memory devices that transfer data faster than their bus speed, such as DDR memory, shall report the operating speed in MT/s (mega-transfers/second). The reported value shall match the conventionally reported values for the technology used by the memory device.", + "readonly": true, + "type": [ + "integer", + "null" + ], + "units": "MHz", + "versionAdded": "v1_3_0" + } + }, + "required": [ + "@odata.id", + "@odata.type", + "Id", + "Name" + ], + "type": "object" + }, + "OemActions": { + "additionalProperties": true, + "description": "The available OEM-specific actions for this resource.", + "longDescription": "This type shall contain the available OEM-specific actions for this resource.", + "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": {}, + "type": "object" + } + }, + "owningEntity": "DMTF", + "release": "2020.3", + "title": "#MemoryMetrics.v1_4_1.MemoryMetrics" +} \ No newline at end of file diff --git a/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json b/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json new file mode 100644 index 0000000..e506f59 --- /dev/null +++ b/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json @@ -0,0 +1,21 @@ +{ + "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile", + "@odata.id": "/redfish/v1/JsonSchemas/MemoryMetrics", + "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile", + "Name": "MemoryMetrics Schema File", + "Schema": "#MemoryMetrics.MemoryMetrics", + "Description": "MemoryMetrics Schema File Location", + "Id": "MemoryMetrics", + "Languages": [ + "en" + ], + "Languages@odata.count": 1, + "Location": [ + { + "Language": "en", + "PublicationUri": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.json", + "Uri": "/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json" + } + ], + "Location@odata.count": 1 +} \ No newline at end of file diff --git a/static/redfish/v1/JsonSchemas/index.json b/static/redfish/v1/JsonSchemas/index.json index 8811f26..fd5abbf 100644 --- a/static/redfish/v1/JsonSchemas/index.json +++ b/static/redfish/v1/JsonSchemas/index.json @@ -4,7 +4,7 @@ "@odata.type": "#JsonSchemaFileCollection.JsonSchemaFileCollection", "Name": "JsonSchemaFile Collection", "Description": "Collection of JsonSchemaFiles", - "Members@odata.count": 58, + "Members@odata.count": 59, "Members": [ { "@odata.id": "/redfish/v1/JsonSchemas/AccountService" @@ -75,6 +75,9 @@ { "@odata.id": "/redfish/v1/JsonSchemas/Memory" }, + { + "@odata.id": "/redfish/v1/JsonSchemas/MemoryMetrics" + }, { "@odata.id": "/redfish/v1/JsonSchemas/Message" }, diff --git a/static/redfish/v1/schema/MemoryMetrics_v1.xml b/static/redfish/v1/schema/MemoryMetrics_v1.xml new file mode 100644 index 0000000..bfeae79 --- /dev/null +++ b/static/redfish/v1/schema/MemoryMetrics_v1.xml @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /redfish/v1/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics + /redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics + /redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics + /redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics + /redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics + /redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics + /redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics + /redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics + /redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics + /redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics + /redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics + /redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics + /redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.17.1