Commit f52e3a6d by Gunnar Billung-Meyer

add property ComposedNode.ComposedNodeState

parent cca60639
......@@ -68,6 +68,9 @@
<EntityType Name="ComposedNode" BaseType="ComposedNode.ComposedNode">
<Property Name="Status" Type="Resource.Status" />
<Property Name="ComposedNodeState" Type="ComposedNode.v1_0_0.ComposedNodeState">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
</Property>
<Property Name="Links" Type="ComposedNode.v1_0_0.Links" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The links object contains the links to other resources that are related to this resource."/>
......@@ -118,7 +121,25 @@
<ComplexType Name="OemActions">
<Annotation Term="OData.AdditionalProperties" Bool="true"/>
</ComplexType>
</ComplexType>
<EnumType Name="ComposedNodeState">
<Member Name="Allocating">
<Annotation Term="OData.Description" String="Allocating resources for node is in progress. Next state can be Allocated or Failed."/>
</Member>
<Member Name="Allocated">
<Annotation Term="OData.Description" String="Node resources has been allocated, but assembly not started yet. After ComposedNode.Assemble action state will progress to Assembling."/>
</Member>
<Member Name="Assembling">
<Annotation Term="OData.Description" String="Assembly process initiated, but not finished yet. When assembly is done it will change into Assembled."/>
</Member>
<Member Name="Failed">
<Annotation Term="OData.Description" String="Allocation or assembly process failed, or in runtime one of composing components was removed or transitioned in error state."/>
</Member>
<Member Name="Assembled">
<Annotation Term="OData.Description" String="Node successfully assembled."/>
</Member>
</EnumType>
</Schema>
......
......@@ -68,6 +68,9 @@
<EntityType Name="ComposedNode" BaseType="ComposedNode.ComposedNode">
<Property Name="Status" Type="Resource.Status" />
<Property Name="ComposedNodeState" Type="ComposedNode.v1_0_0.ComposedNodeState">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
</Property>
<Property Name="Links" Type="ComposedNode.v1_0_0.Links" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The links object contains the links to other resources that are related to this resource."/>
......@@ -118,7 +121,25 @@
<ComplexType Name="OemActions">
<Annotation Term="OData.AdditionalProperties" Bool="true"/>
</ComplexType>
</ComplexType>
<EnumType Name="ComposedNodeState">
<Member Name="Allocating">
<Annotation Term="OData.Description" String="Allocating resources for node is in progress. Next state can be Allocated or Failed."/>
</Member>
<Member Name="Allocated">
<Annotation Term="OData.Description" String="Node resources has been allocated, but assembly not started yet. After ComposedNode.Assemble action state will progress to Assembling."/>
</Member>
<Member Name="Assembling">
<Annotation Term="OData.Description" String="Assembly process initiated, but not finished yet. When assembly is done it will change into Assembled."/>
</Member>
<Member Name="Failed">
<Annotation Term="OData.Description" String="Allocation or assembly process failed, or in runtime one of composing components was removed or transitioned in error state."/>
</Member>
<Member Name="Assembled">
<Annotation Term="OData.Description" String="Node successfully assembled."/>
</Member>
</EnumType>
</Schema>
......
......@@ -96,6 +96,13 @@ This is the schema definition for the ComposedNode resource.
<tr><td>ComposedIn {</td><td>reference(<a href="composednode.html#composednode">ComposedNode</a>)</td><td>Yes</td><td></td><td>read-only</td><td>This is a link to the ComposedNode, this ComposedNode is composed in.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;@odata.id</td><td>string</td><td></td><td></td><td>read-only</td><td>The unique identifier for a resource.<br />Format: uri</td></tr>
<tr><td>}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>ComposedNodeState</td><td>string</td><td>Yes</td><td></td><td>read-only</td><td>Possible Values:<ul>
<li>Allocating: Allocating resources for node is in progress. Next state can be Allocated or Failed.</li>
<li>Allocated: Node resources has been allocated, but assembly not started yet. After ComposedNode.Assemble action state will progress to Assembling.</li>
<li>Assembling: Assembly process initiated, but not finished yet. When assembly is done it will change into Assembled.</li>
<li>Failed: Allocation or assembly process failed, or in runtime one of composing components was removed or transitioned in error state.</li>
<li>Assembled: Node successfully assembled.</li>
</ul></td></tr>
<tr><td>Connections {</td><td>reference(<a href="hsllconnectioncollection.html#hsllconnectioncollection">HSLLConnectionCollection</a>)</td><td></td><td></td><td>read-only</td><td>This is a link to a collection of HSLLConnections that connect the resources within this composition.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;@odata.id</td><td>string</td><td></td><td></td><td>read-only</td><td>The unique identifier for a resource.<br />Format: uri</td></tr>
<tr><td>}</td><td></td><td></td><td></td><td></td><td></td></tr>
......@@ -306,6 +313,8 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"ComposedNodeState": "Allocating",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Connections": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1/Connections"
......
......@@ -126,6 +126,17 @@
"longDescription": "This object shall only contain a reference to a resource that complies to the ComposedNode schema.",
"readonly": true
},
"ComposedNodeState": {
"anyOf": [
{
"$ref": "#/definitions/ComposedNodeState"
},
{
"type": "null"
}
],
"readonly": true
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of HSLLConnections that connect the resources within this composition.",
......@@ -196,6 +207,23 @@
],
"type": "object"
},
"ComposedNodeState": {
"enum": [
"Allocating",
"Allocated",
"Assembling",
"Failed",
"Assembled"
],
"enumDescriptions": {
"Allocated": "Node resources has been allocated, but assembly not started yet. After ComposedNode.Assemble action state will progress to Assembling.",
"Allocating": "Allocating resources for node is in progress. Next state can be Allocated or Failed.",
"Assembled": "Node successfully assembled.",
"Assembling": "Assembly process initiated, but not finished yet. When assembly is done it will change into Assembled.",
"Failed": "Allocation or assembly process failed, or in runtime one of composing components was removed or transitioned in error state."
},
"type": "string"
},
"Links": {
"additionalProperties": false,
"patternProperties": {
......
......@@ -126,6 +126,17 @@
"longDescription": "This object shall only contain a reference to a resource that complies to the ComposedNode schema.",
"readonly": true
},
"ComposedNodeState": {
"anyOf": [
{
"$ref": "#/definitions/ComposedNodeState"
},
{
"type": "null"
}
],
"readonly": true
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of HSLLConnections that connect the resources within this composition.",
......@@ -196,6 +207,23 @@
],
"type": "object"
},
"ComposedNodeState": {
"enum": [
"Allocating",
"Allocated",
"Assembling",
"Failed",
"Assembled"
],
"enumDescriptions": {
"Allocated": "Node resources has been allocated, but assembly not started yet. After ComposedNode.Assemble action state will progress to Assembling.",
"Allocating": "Allocating resources for node is in progress. Next state can be Allocated or Failed.",
"Assembled": "Node successfully assembled.",
"Assembling": "Assembly process initiated, but not finished yet. When assembly is done it will change into Assembled.",
"Failed": "Allocation or assembly process failed, or in runtime one of composing components was removed or transitioned in error state."
},
"type": "string"
},
"Links": {
"additionalProperties": false,
"patternProperties": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment