Commit d4bd55d1 by Gunnar Billung-Meyer

add Chassis property to ComposedNode

parent 2f59b4f3
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<edmx:Include Namespace="Resource"/> <edmx:Include Namespace="Resource"/>
<edmx:Include Namespace="Resource.v1_0_0" /> <edmx:Include Namespace="Resource.v1_0_0" />
</edmx:Reference> </edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
<edmx:Include Namespace="Chassis"/>
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml"> <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
<edmx:Include Namespace="PortCollection"/> <edmx:Include Namespace="PortCollection"/>
</edmx:Reference> </edmx:Reference>
...@@ -73,28 +76,34 @@ ...@@ -73,28 +76,34 @@
<Annotation Term="OData.Description" String="The available actions for this resource."/> <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."/> <Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
</Property> </Property>
<NavigationProperty Name="Chassis" Type="Chassis.Chassis">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to the Chassis, this ComposedNode is resides in."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the Chassis schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="ContainedResources" 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.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<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.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.LongDescription" String="This object shall only contain references to resources that comply to the ComputerSystem, PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false"> <NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <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 resources 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.LongDescription" String="This object shall only contain a reference to a resource that complies to the HSLLConnectionCollection schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="ProvidedPorts" Type="PortCollection.PortCollection" Nullable="false"> <NavigationProperty Name="ProvidedPorts" Type="PortCollection.PortCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="This is a link to a collection of Ports that are provided by this composition."/> <Annotation Term="OData.Description" String="This is a link to a collection of Ports that are provided by this composition."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the Port schema."/> <Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the PortCollection schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="ComposedIn" Type="ComposedNode.ComposedNode"> <NavigationProperty Name="ComposedIn" Type="ComposedNode.ComposedNode">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to the ComposedNode, this ComposedNode is composed in."/> <Annotation Term="OData.Description" String="This is a link to the ComposedNode, this ComposedNode is composed in."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that comply to the ComposedNode schema."/> <Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the ComposedNode schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
</EntityType> </EntityType>
......
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<edmx:Include Namespace="Resource"/> <edmx:Include Namespace="Resource"/>
<edmx:Include Namespace="Resource.v1_0_0" /> <edmx:Include Namespace="Resource.v1_0_0" />
</edmx:Reference> </edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
<edmx:Include Namespace="Chassis"/>
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml"> <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
<edmx:Include Namespace="PortCollection"/> <edmx:Include Namespace="PortCollection"/>
</edmx:Reference> </edmx:Reference>
...@@ -73,28 +76,34 @@ ...@@ -73,28 +76,34 @@
<Annotation Term="OData.Description" String="The available actions for this resource."/> <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."/> <Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
</Property> </Property>
<NavigationProperty Name="Chassis" Type="Chassis.Chassis">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to the Chassis, this ComposedNode is resides in."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the Chassis schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="ContainedResources" 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.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<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.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.LongDescription" String="This object shall only contain references to resources that comply to the ComputerSystem, PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false"> <NavigationProperty Name="Connections" Type="HSLLConnectionCollection.HSLLConnectionCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <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 resources 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.LongDescription" String="This object shall only contain a reference to a resource that complies to the HSLLConnectionCollection schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="ProvidedPorts" Type="PortCollection.PortCollection" Nullable="false"> <NavigationProperty Name="ProvidedPorts" Type="PortCollection.PortCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="This is a link to a collection of Ports that are provided by this composition."/> <Annotation Term="OData.Description" String="This is a link to a collection of Ports that are provided by this composition."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the Port schema."/> <Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the PortCollection schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
<NavigationProperty Name="ComposedIn" Type="ComposedNode.ComposedNode"> <NavigationProperty Name="ComposedIn" Type="ComposedNode.ComposedNode">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to the ComposedNode, this ComposedNode is composed in."/> <Annotation Term="OData.Description" String="This is a link to the ComposedNode, this ComposedNode is composed in."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that comply to the ComposedNode schema."/> <Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the ComposedNode schema."/>
<Annotation Term="OData.AutoExpandReferences"/> <Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty> </NavigationProperty>
</EntityType> </EntityType>
......
...@@ -90,6 +90,9 @@ This is the schema definition for the ComposedNode resource. ...@@ -90,6 +90,9 @@ This is the schema definition for the ComposedNode resource.
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;}</td><td></td><td></td><td></td><td></td><td></td></tr> <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;Oem { }</td><td>object</td><td></td><td></td><td>read-write</td><td></td></tr> <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;Oem { }</td><td>object</td><td></td><td></td><td>read-write</td><td></td></tr>
<tr><td>}</td><td></td><td></td><td></td><td></td><td></td></tr> <tr><td>}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>Chassis {</td><td>reference(<a href="chassis.html#chassis">Chassis</a>)</td><td>Yes</td><td></td><td>read-only</td><td>This is a link to the Chassis, this ComposedNode is resides 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>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>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>&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>}</td><td></td><td></td><td></td><td></td><td></td></tr>
...@@ -273,6 +276,12 @@ Content-Type: application/json ...@@ -273,6 +276,12 @@ Content-Type: application/json
<br /> <br />
&nbsp;&nbsp;&nbsp;&nbsp;} &nbsp;&nbsp;&nbsp;&nbsp;}
<br /> <br />
&nbsp;&nbsp;&nbsp;&nbsp;"Chassis": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Chassis/Chassis1"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"ComposedIn": { &nbsp;&nbsp;&nbsp;&nbsp;"ComposedIn": {
<br /> <br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1" &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1"
......
...@@ -107,6 +107,19 @@ ...@@ -107,6 +107,19 @@
"description": "The available actions for this resource.", "description": "The available actions for this resource.",
"longDescription": "The Actions property shall contain the available actions for this resource." "longDescription": "The Actions property shall contain the available actions for this resource."
}, },
"Chassis": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
},
{
"type": "null"
}
],
"description": "This is a link to the Chassis, this ComposedNode is resides in.",
"longDescription": "This object shall only contain a reference to a resource that complies to the Chassis schema.",
"readonly": true
},
"ComposedIn": { "ComposedIn": {
"anyOf": [ "anyOf": [
{ {
...@@ -117,13 +130,13 @@ ...@@ -117,13 +130,13 @@
} }
], ],
"description": "This is a link to the ComposedNode, this ComposedNode is composed in.", "description": "This is a link to the ComposedNode, this ComposedNode is composed in.",
"longDescription": "This object shall only contain a reference to a resource that comply to the ComposedNode schema.", "longDescription": "This object shall only contain a reference to a resource that complies to the ComposedNode schema.",
"readonly": true "readonly": true
}, },
"Connections": { "Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection", "$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.", "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.", "longDescription": "This object shall only contain a reference to a resource that complies to the HSLLConnectionCollection schema.",
"readonly": false "readonly": false
}, },
"ContainedResources": { "ContainedResources": {
...@@ -131,7 +144,7 @@ ...@@ -131,7 +144,7 @@
"items": { "items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef" "$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 or Port schema.", "longDescription": "This object shall only contain references to resources that comply to the ComputerSystem, PCIeDevice or Port schema.",
"readonly": false, "readonly": false,
"type": "array" "type": "array"
}, },
...@@ -170,7 +183,7 @@ ...@@ -170,7 +183,7 @@
"ProvidedPorts": { "ProvidedPorts": {
"$ref": "http://redfish.dmtf.org/schemas/v1/PortCollection.json#/definitions/PortCollection", "$ref": "http://redfish.dmtf.org/schemas/v1/PortCollection.json#/definitions/PortCollection",
"description": "This is a link to a collection of Ports that are provided by this composition.", "description": "This is a link to a collection of Ports that are provided by this composition.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the Port schema.", "longDescription": "This object shall only contain a reference to a resource that complies to the PortCollection schema.",
"readonly": false "readonly": false
}, },
"Status": { "Status": {
......
...@@ -107,6 +107,19 @@ ...@@ -107,6 +107,19 @@
"description": "The available actions for this resource.", "description": "The available actions for this resource.",
"longDescription": "The Actions property shall contain the available actions for this resource." "longDescription": "The Actions property shall contain the available actions for this resource."
}, },
"Chassis": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
},
{
"type": "null"
}
],
"description": "This is a link to the Chassis, this ComposedNode is resides in.",
"longDescription": "This object shall only contain a reference to a resource that complies to the Chassis schema.",
"readonly": true
},
"ComposedIn": { "ComposedIn": {
"anyOf": [ "anyOf": [
{ {
...@@ -117,13 +130,13 @@ ...@@ -117,13 +130,13 @@
} }
], ],
"description": "This is a link to the ComposedNode, this ComposedNode is composed in.", "description": "This is a link to the ComposedNode, this ComposedNode is composed in.",
"longDescription": "This object shall only contain a reference to a resource that comply to the ComposedNode schema.", "longDescription": "This object shall only contain a reference to a resource that complies to the ComposedNode schema.",
"readonly": true "readonly": true
}, },
"Connections": { "Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection", "$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.", "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.", "longDescription": "This object shall only contain a reference to a resource that complies to the HSLLConnectionCollection schema.",
"readonly": false "readonly": false
}, },
"ContainedResources": { "ContainedResources": {
...@@ -131,7 +144,7 @@ ...@@ -131,7 +144,7 @@
"items": { "items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef" "$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 or Port schema.", "longDescription": "This object shall only contain references to resources that comply to the ComputerSystem, PCIeDevice or Port schema.",
"readonly": false, "readonly": false,
"type": "array" "type": "array"
}, },
...@@ -170,7 +183,7 @@ ...@@ -170,7 +183,7 @@
"ProvidedPorts": { "ProvidedPorts": {
"$ref": "http://redfish.dmtf.org/schemas/v1/PortCollection.json#/definitions/PortCollection", "$ref": "http://redfish.dmtf.org/schemas/v1/PortCollection.json#/definitions/PortCollection",
"description": "This is a link to a collection of Ports that are provided by this composition.", "description": "This is a link to a collection of Ports that are provided by this composition.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the Port schema.", "longDescription": "This object shall only contain a reference to a resource that complies to the PortCollection schema.",
"readonly": false "readonly": false
}, },
"Status": { "Status": {
......
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