Commit 2f59b4f3 by Gunnar Billung-Meyer

rename ComposedNode.ContainedNodes to ComposedNode.ContainedResources

parent 95a9d54e
......@@ -73,15 +73,15 @@
<Annotation Term="OData.Description" String="The available actions for this resource."/>
<Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
</Property>
<NavigationProperty Name="ContainedNodes" Type="Collection(Resource.Item)" Nullable="false">
<NavigationProperty Name="ContainedResources" Type="Collection(Resource.Item)" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="An array of references to nodes this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice, a Port or a ComposedNode."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice, Port or ComposedNode schema."/>
<Annotation Term="OData.Description" String="An array of references to resources this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice or a Port (of a PCIeSwitch or a ComposedNode)."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="This is a link to a collection of HSLLConnections that connect the nodes within this composition."/>
<Annotation Term="OData.Description" String="This is a link to a collection of HSLLConnections that connect the resources within this composition."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
......
......@@ -73,15 +73,15 @@
<Annotation Term="OData.Description" String="The available actions for this resource."/>
<Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
</Property>
<NavigationProperty Name="ContainedNodes" Type="Collection(Resource.Item)" Nullable="false">
<NavigationProperty Name="ContainedResources" Type="Collection(Resource.Item)" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="An array of references to nodes this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice, a Port or a ComposedNode."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice, Port or ComposedNode schema."/>
<Annotation Term="OData.Description" String="An array of references to resources this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice or a Port (of a PCIeSwitch or a ComposedNode)."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="This is a link to a collection of HSLLConnections that connect the nodes within this composition."/>
<Annotation Term="OData.Description" String="This is a link to a collection of HSLLConnections that connect the resources within this composition."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
......
......@@ -93,13 +93,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>Connections {</td><td>reference(<a href="hsllconnectioncollection.html#hsllconnectioncollection">HSLLConnectionCollection</a>)</td><td></td><td></td><td>read-write</td><td>This is a link to a collection of HSLLConnections that connect the nodes within this composition.</td></tr>
<tr><td>Connections {</td><td>reference(<a href="hsllconnectioncollection.html#hsllconnectioncollection">HSLLConnectionCollection</a>)</td><td></td><td></td><td>read-write</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>
<tr><td>ContainedNodes [ {</td><td>array[reference]</td><td></td><td></td><td>read-write</td><td>An array of references to nodes this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice, a Port or a ComposedNode.</td></tr>
<tr><td>ContainedResources [ {</td><td>array[reference]</td><td></td><td></td><td>read-write</td><td>An array of references to resources this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice or a Port (of a PCIeSwitch or a ComposedNode).</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>ContainedNodes@odata.count</td><td>number</td><td></td><td></td><td>read-only</td><td>The number of items in a collection.</td></tr>
<tr><td>ContainedResources@odata.count</td><td>number</td><td></td><td></td><td>read-only</td><td>The number of items in a collection.</td></tr>
<tr><td>Description</td><td>string</td><td>Yes</td><td></td><td>read-only</td><td>Provides a description of this resource and is used for commonality in the schema definitions.</td></tr>
<tr><td>Id</td><td>string</td><td></td><td>GET</td><td>read-only</td><td>Uniquely identifies the resource within the collection of like resources.</td></tr>
<tr><td>Links {</td><td>object</td><td></td><td></td><td>read-only</td><td>The links object contains the links to other resources that are related to this resource.</td></tr>
......@@ -285,13 +285,13 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"ContainedNodes": [{
&nbsp;&nbsp;&nbsp;&nbsp;"ContainedResources": [{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "uri"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}],
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"ContainedNodes@odata.count": 1,
&nbsp;&nbsp;&nbsp;&nbsp;"ContainedResources@odata.count": 1,
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Description": "string",
<br />
......
......@@ -122,20 +122,20 @@
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of HSLLConnections that connect the nodes within this composition.",
"description": "This is a link to a collection of HSLLConnections that connect the resources within this composition.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema.",
"readonly": false
},
"ContainedNodes": {
"description": "An array of references to nodes this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice, a Port or a ComposedNode.",
"ContainedResources": {
"description": "An array of references to resources this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice or a Port (of a PCIeSwitch or a ComposedNode).",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef"
},
"longDescription": "This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice, Port or ComposedNode schema.",
"longDescription": "This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice or Port schema.",
"readonly": false,
"type": "array"
},
"ContainedNodes@odata.count": {
"ContainedResources@odata.count": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
},
"Description": {
......
......@@ -122,20 +122,20 @@
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of HSLLConnections that connect the nodes within this composition.",
"description": "This is a link to a collection of HSLLConnections that connect the resources within this composition.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema.",
"readonly": false
},
"ContainedNodes": {
"description": "An array of references to nodes this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice, a Port or a ComposedNode.",
"ContainedResources": {
"description": "An array of references to resources this ComposedNode consists of. This can either be a ComputerSystem, a PCIeDevice or a Port (of a PCIeSwitch or a ComposedNode).",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef"
},
"longDescription": "This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice, Port or ComposedNode schema.",
"longDescription": "This object shall only contain references to the resource that complies to the ComputerSystem, PCIeDevice or Port schema.",
"readonly": false,
"type": "array"
},
"ContainedNodes@odata.count": {
"ContainedResources@odata.count": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
},
"Description": {
......
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