Commit 1b97871f by Gunnar Billung-Meyer

change HSLLInterface.Connections to HSLLInterface.ComposedNodes

parent e3b477e3
......@@ -20,8 +20,8 @@
<edmx:Include Namespace="Resource"/>
<edmx:Include Namespace="Resource.v1_0_0" />
</edmx:Reference>
<edmx:Reference Uri="HSLLConnectionCollection_v1.xml">
<edmx:Include Namespace="HSLLConnectionCollection"/>
<edmx:Reference Uri="ComposedNode_v1.xml">
<edmx:Include Namespace="ComposedNode"/>
</edmx:Reference>
<edmx:DataServices>
......@@ -74,15 +74,15 @@
<Annotation Term="OData.LongDescription" String="The value of this property shall contain the Maximum width of the HSLLInterface specified in number of lanes."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<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 connections that use this interface."/>
<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>
</EntityType>
<ComplexType Name="Links" BaseType="Resource.Links">
<NavigationProperty Name="ComposedNodes" Type="Collection(ComposedNode.ComposedNode)" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="An array of references to ComposedNodes that use this interface."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to resources that comply to the ComposedNode schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</ComplexType>
</Schema>
......
......@@ -20,8 +20,8 @@
<edmx:Include Namespace="Resource"/>
<edmx:Include Namespace="Resource.v1_0_0" />
</edmx:Reference>
<edmx:Reference Uri="HSLLConnectionCollection_v1.xml">
<edmx:Include Namespace="HSLLConnectionCollection"/>
<edmx:Reference Uri="ComposedNode_v1.xml">
<edmx:Include Namespace="ComposedNode"/>
</edmx:Reference>
<edmx:DataServices>
......@@ -74,15 +74,15 @@
<Annotation Term="OData.LongDescription" String="The value of this property shall contain the Maximum width of the HSLLInterface specified in number of lanes."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<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 connections that use this interface."/>
<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>
</EntityType>
<ComplexType Name="Links" BaseType="Resource.Links">
<NavigationProperty Name="ComposedNodes" Type="Collection(ComposedNode.ComposedNode)" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="An array of references to ComposedNodes that use this interface."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain references to resources that comply to the ComposedNode schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</ComplexType>
</Schema>
......
......@@ -105,7 +105,7 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Members": [{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Switches/Switch1/Ports/Port1/HSLLInterface/Connections/HSLLConnection1"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}],
<br />
......
......@@ -75,12 +75,13 @@ This is the schema definition for the HSLLInterface resource.
<tr><td>@odata.context</td><td>string</td><td></td><td></td><td>read-only</td><td>The OData description of a payload.<br />Format: uri</td></tr>
<tr><td>@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>@odata.type</td><td>string</td><td></td><td></td><td>read-only</td><td>The type of a resource.</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 connections that use this interface.</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>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>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;ComposedNodes [ {</td><td>array[reference(<a href="composednode.html#composednode">ComposedNode</a>)]</td><td></td><td></td><td>read-write</td><td>An array of references to ComposedNodes that use this interface.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&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;} ]</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;ComposedNodes@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>&nbsp;&nbsp;&nbsp;&nbsp;Oem { }</td><td>object</td><td></td><td></td><td>read-write</td><td>Oem extension object.</td></tr>
<tr><td>}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>MaxSpeedGbps</td><td>number</td><td>Yes</td><td></td><td>read-only</td><td>The maximum speed of this HSLLInterface in GBps<br />Unit: GBytes/s<br />Minimum: 0</td></tr>
......@@ -110,18 +111,20 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.type": "string",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Connections": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Switches/Switch1/Ports/Port1/HSLLInterface/Connections"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Description": "string",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Id": "string",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Links": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ComposedNodes": [{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}],
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ComposedNodes@odata.count": 1,
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Oem": { }
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}
......
......@@ -143,8 +143,8 @@ All other referred versions, such as JSON, ODATA and SSDP, are corresponding to
<tr><td><a href="computersystemcollection.html#computersystemcollection">ComputerSystemCollection</a></td><td>/redfish/v1/Systems</td></tr>
<tr><td><a href="ethernetinterface.html#ethernetinterface">EthernetInterface</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces/{EthernetInterfaceID}<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/{EthernetInterfaceID}<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/PCIeFunctions/{PCIeFunctionID}/{EthernetInterfaceID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/PCIeFunctions/{PCIeFunctionID}/{EthernetInterfaceID}</td></tr>
<tr><td><a href="ethernetinterfacecollection.html#ethernetinterfacecollection">EthernetInterfaceCollection</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces</td></tr>
<tr><td><a href="hsllconnection.html#hsllconnection">HSLLConnection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections/{HSLLConnectionID}<br />/redfish/v1/Systems/{ComputerSystemID}/HSLLInterface/Connections/{HSLLConnectionID}<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/HSLLInterface/Connections/{HSLLConnectionID}<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/HSLLInterface/Connections/{HSLLConnectionID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/HSLLInterface/Connections/{HSLLConnectionID}</td></tr>
<tr><td><a href="hsllconnectioncollection.html#hsllconnectioncollection">HSLLConnectionCollection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections<br />/redfish/v1/Systems/{ComputerSystemID}/HSLLInterface/Connections<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/HSLLInterface/Connections<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/HSLLInterface/Connections<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/HSLLInterface/Connections</td></tr>
<tr><td><a href="hsllconnection.html#hsllconnection">HSLLConnection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections/{HSLLConnectionID}</td></tr>
<tr><td><a href="hsllconnectioncollection.html#hsllconnectioncollection">HSLLConnectionCollection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections</td></tr>
<tr><td><a href="hsllinterface.html#hsllinterface">HSLLInterface</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/HSLLInterface<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/HSLLInterface<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections/{HSLLConnectionID}/EndpointA<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/Connections/{HSLLConnectionID}/EndpointB<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/HSLLInterface<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/HSLLInterface</td></tr>
<tr><td><a href="jsonschemafile.html#jsonschemafile">JsonSchemaFile</a></td><td>/redfish/v1/JsonSchemas/{JsonSchemaFileID}</td></tr>
<tr><td><a href="jsonschemafilecollection.html#jsonschemafilecollection">JsonSchemaFileCollection</a></td><td>/redfish/v1/JsonSchemas</td></tr>
......
......@@ -30,12 +30,6 @@
"@odata.type": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/type"
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of connections that use this interface.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema.",
"readonly": false
},
"Description": {
"anyOf": [
{
......@@ -146,6 +140,18 @@
}
},
"properties": {
"ComposedNodes": {
"description": "An array of references to ComposedNodes that use this interface.",
"items": {
"$ref": "ComposedNode_v1.xml/ComposedNode.json#/definitions/ComposedNode"
},
"longDescription": "This object shall only contain references to resources that comply to the ComposedNode schema.",
"readonly": false,
"type": "array"
},
"ComposedNodes@odata.count": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
"description": "Oem extension object.",
......
......@@ -30,12 +30,6 @@
"@odata.type": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/type"
},
"Connections": {
"$ref": "HSLLConnectionCollection_v1.xml/HSLLConnectionCollection.json#/definitions/HSLLConnectionCollection",
"description": "This is a link to a collection of connections that use this interface.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the HSLLConnection schema.",
"readonly": false
},
"Description": {
"anyOf": [
{
......@@ -146,6 +140,18 @@
}
},
"properties": {
"ComposedNodes": {
"description": "An array of references to ComposedNodes that use this interface.",
"items": {
"$ref": "ComposedNode_v1.xml/ComposedNode.json#/definitions/ComposedNode"
},
"longDescription": "This object shall only contain references to resources that comply to the ComposedNode schema.",
"readonly": false,
"type": "array"
},
"ComposedNodes@odata.count": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
"description": "Oem extension object.",
......
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