Fix JsonSchema indexes
JsonSchema was throwing errors in the validator, so implement changes to
the update script to add the appropiate indexes.
Tested by:
Schema validator passes on the JsonSchema Fields
Change-Id: I6cb2737901b55c1089aef744d3ce3c3dfe13f17f
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
diff --git a/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json b/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json
new file mode 100644
index 0000000..3850a6e
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json
@@ -0,0 +1,253 @@
+{
+ "$ref": "#/definitions/MemoryChunks",
+ "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_4_0.json",
+ "copyright": "Copyright 2014-2018 Distributed Management Task Force, Inc. (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",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {
+ "Oem": {
+ "$ref": "#/definitions/OemActions"
+ }
+ },
+ "type": "object"
+ },
+ "AddressRangeType": {
+ "enum": [
+ "Volatile",
+ "PMEM",
+ "Block"
+ ],
+ "enumDescriptions": {
+ "Block": "Block accesible memory.",
+ "PMEM": "Byte accessible persistent memory.",
+ "Volatile": "Volatile memory."
+ },
+ "type": "string"
+ },
+ "InterleaveSet": {
+ "additionalProperties": false,
+ "description": "This an interleave set for a memory chunk.",
+ "longDescription": "This type shall describe an interleave set of which the memory chunk is a part.",
+ "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",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {
+ "Memory": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/idRef",
+ "description": "Describes a memory device of the interleave set.",
+ "longDescription": "The value of this property shall be the memory device to which these settings apply.",
+ "readonly": true
+ },
+ "MemoryLevel": {
+ "description": "Level of the interleave set for multi-level tiered memory.",
+ "longDescription": "The value of this property shall be the level of this interleave set for multi-level tiered memory.",
+ "readonly": true,
+ "type": [
+ "number",
+ "null"
+ ]
+ },
+ "OffsetMiB": {
+ "description": "Offset within the DIMM that corresponds to the start of this memory region, measured in mebibytes (MiB).",
+ "longDescription": "The value of this property shall be the offset within the DIMM that corresponds to the start of this memory region, with units in MiB.",
+ "readonly": true,
+ "type": [
+ "number",
+ "null"
+ ]
+ },
+ "RegionId": {
+ "description": "DIMM region identifier.",
+ "longDescription": "The value of this property shall be the DIMM region identifier.",
+ "readonly": true,
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "SizeMiB": {
+ "description": "Size of this memory region measured in mebibytes (MiB).",
+ "longDescription": "The value of this property shall be the size of this memory region, with units in MiB.",
+ "readonly": true,
+ "type": [
+ "number",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "MemoryChunks": {
+ "additionalProperties": false,
+ "description": "This is the schema definition of a Memory Chunk and its configuration.",
+ "longDescription": "This resource shall be used to represent Memory Chunks and Interleave Sets 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",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {
+ "@odata.context": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/context"
+ },
+ "@odata.etag": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/etag"
+ },
+ "@odata.id": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/id"
+ },
+ "@odata.type": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/type"
+ },
+ "Actions": {
+ "$ref": "#/definitions/Actions",
+ "description": "The available actions for this resource.",
+ "longDescription": "The Actions property shall contain the available actions for this resource."
+ },
+ "AddressRangeType": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/AddressRangeType"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "description": "Memory type of this memory chunk.",
+ "longDescription": "The value of this property shall be the type of memory chunk.",
+ "readonly": true
+ },
+ "Description": {
+ "anyOf": [
+ {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "readonly": true
+ },
+ "Id": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+ "readonly": true
+ },
+ "InterleaveSets": {
+ "description": "This is the interleave sets for the memory chunk.",
+ "items": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/InterleaveSet"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "longDescription": "These properties shall represent the interleave sets for the memory chunk.",
+ "type": "array"
+ },
+ "IsMirrorEnabled": {
+ "description": "Mirror Enabled status.",
+ "longDescription": "The value of this property shall indicate if memory mirroring is enabled for this MemoryChunk.",
+ "readonly": true,
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "IsSpare": {
+ "description": "Spare enabled status.",
+ "longDescription": "The value of this property shall indicate if sparing is enabled for this MemoryChunk.",
+ "readonly": true,
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "MemoryChunkSizeMiB": {
+ "description": "Size of the memory chunk measured in mebibytes (MiB).",
+ "longDescription": "The value of this property shall be the size of the memory chunk in MiB.",
+ "readonly": true,
+ "type": [
+ "number",
+ "null"
+ ]
+ },
+ "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": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
+ "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+ },
+ "Status": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status"
+ }
+ },
+ "required": [
+ "Id",
+ "Name"
+ ],
+ "type": "object"
+ },
+ "OemActions": {
+ "additionalProperties": true,
+ "description": "The available OEM specific actions for this resource.",
+ "longDescription": "This type shall contain any additional OEM 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",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "properties": {},
+ "type": "object"
+ }
+ },
+ "owningEntity": "DMTF",
+ "title": "#MemoryChunks.v1_2_1.MemoryChunks"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MemoryChunks/index.json b/static/redfish/v1/JsonSchemas/MemoryChunks/index.json
index 3850a6e..0f8d5b9 100644
--- a/static/redfish/v1/JsonSchemas/MemoryChunks/index.json
+++ b/static/redfish/v1/JsonSchemas/MemoryChunks/index.json
@@ -1,253 +1,21 @@
{
- "$ref": "#/definitions/MemoryChunks",
- "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_4_0.json",
- "copyright": "Copyright 2014-2018 Distributed Management Task Force, Inc. (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",
- "number",
- "null",
- "object",
- "string"
- ]
- }
- },
- "properties": {
- "Oem": {
- "$ref": "#/definitions/OemActions"
- }
- },
- "type": "object"
- },
- "AddressRangeType": {
- "enum": [
- "Volatile",
- "PMEM",
- "Block"
- ],
- "enumDescriptions": {
- "Block": "Block accesible memory.",
- "PMEM": "Byte accessible persistent memory.",
- "Volatile": "Volatile memory."
- },
- "type": "string"
- },
- "InterleaveSet": {
- "additionalProperties": false,
- "description": "This an interleave set for a memory chunk.",
- "longDescription": "This type shall describe an interleave set of which the memory chunk is a part.",
- "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",
- "number",
- "null",
- "object",
- "string"
- ]
- }
- },
- "properties": {
- "Memory": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/idRef",
- "description": "Describes a memory device of the interleave set.",
- "longDescription": "The value of this property shall be the memory device to which these settings apply.",
- "readonly": true
- },
- "MemoryLevel": {
- "description": "Level of the interleave set for multi-level tiered memory.",
- "longDescription": "The value of this property shall be the level of this interleave set for multi-level tiered memory.",
- "readonly": true,
- "type": [
- "number",
- "null"
- ]
- },
- "OffsetMiB": {
- "description": "Offset within the DIMM that corresponds to the start of this memory region, measured in mebibytes (MiB).",
- "longDescription": "The value of this property shall be the offset within the DIMM that corresponds to the start of this memory region, with units in MiB.",
- "readonly": true,
- "type": [
- "number",
- "null"
- ]
- },
- "RegionId": {
- "description": "DIMM region identifier.",
- "longDescription": "The value of this property shall be the DIMM region identifier.",
- "readonly": true,
- "type": [
- "string",
- "null"
- ]
- },
- "SizeMiB": {
- "description": "Size of this memory region measured in mebibytes (MiB).",
- "longDescription": "The value of this property shall be the size of this memory region, with units in MiB.",
- "readonly": true,
- "type": [
- "number",
- "null"
- ]
- }
- },
- "type": "object"
- },
- "MemoryChunks": {
- "additionalProperties": false,
- "description": "This is the schema definition of a Memory Chunk and its configuration.",
- "longDescription": "This resource shall be used to represent Memory Chunks and Interleave Sets 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",
- "number",
- "null",
- "object",
- "string"
- ]
- }
- },
- "properties": {
- "@odata.context": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/context"
- },
- "@odata.etag": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/etag"
- },
- "@odata.id": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/id"
- },
- "@odata.type": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/type"
- },
- "Actions": {
- "$ref": "#/definitions/Actions",
- "description": "The available actions for this resource.",
- "longDescription": "The Actions property shall contain the available actions for this resource."
- },
- "AddressRangeType": {
- "anyOf": [
- {
- "$ref": "#/definitions/AddressRangeType"
- },
- {
- "type": "null"
- }
- ],
- "description": "Memory type of this memory chunk.",
- "longDescription": "The value of this property shall be the type of memory chunk.",
- "readonly": true
- },
- "Description": {
- "anyOf": [
- {
- "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
- },
- {
- "type": "null"
- }
- ],
- "readonly": true
- },
- "Id": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
- "readonly": true
- },
- "InterleaveSets": {
- "description": "This is the interleave sets for the memory chunk.",
- "items": {
- "anyOf": [
- {
- "$ref": "#/definitions/InterleaveSet"
- },
- {
- "type": "null"
- }
- ]
- },
- "longDescription": "These properties shall represent the interleave sets for the memory chunk.",
- "type": "array"
- },
- "IsMirrorEnabled": {
- "description": "Mirror Enabled status.",
- "longDescription": "The value of this property shall indicate if memory mirroring is enabled for this MemoryChunk.",
- "readonly": true,
- "type": [
- "boolean",
- "null"
- ]
- },
- "IsSpare": {
- "description": "Spare enabled status.",
- "longDescription": "The value of this property shall indicate if sparing is enabled for this MemoryChunk.",
- "readonly": true,
- "type": [
- "boolean",
- "null"
- ]
- },
- "MemoryChunkSizeMiB": {
- "description": "Size of the memory chunk measured in mebibytes (MiB).",
- "longDescription": "The value of this property shall be the size of the memory chunk in MiB.",
- "readonly": true,
- "type": [
- "number",
- "null"
- ]
- },
- "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": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
- "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
- },
- "Status": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status"
- }
- },
- "required": [
- "Id",
- "Name"
- ],
- "type": "object"
- },
- "OemActions": {
- "additionalProperties": true,
- "description": "The available OEM specific actions for this resource.",
- "longDescription": "This type shall contain any additional OEM 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",
- "number",
- "null",
- "object",
- "string"
- ]
- }
- },
- "properties": {},
- "type": "object"
+ "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+ "@odata.id": "/redfish/v1/JSONSchemas/MemoryChunks",
+ "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+ "Name": "MemoryChunks Schema File",
+ "Schema": "#MemoryChunks.MemoryChunks",
+ "Description": "MemoryChunks Schema File Location",
+ "Id": "MemoryChunks",
+ "Languages": [
+ "en"
+ ],
+ "Languages@odata.count": 1,
+ "Location": [
+ {
+ "Language": "en",
+ "PublicationUri": "http://redfish.dmtf.org/schemas/v1/MemoryChunks.json",
+ "Uri": "/redfish/v1/JSONSchemas/MemoryChunks/MemoryChunks.json"
}
- },
- "owningEntity": "DMTF",
- "title": "#MemoryChunks.v1_2_1.MemoryChunks"
+ ],
+ "Location@odata.count": 1
}
\ No newline at end of file