Commit bcd8a461 by Gunnar Billung-Meyer

add PCIeFunction.Provider and remove Port/PCIeDevice instead

parent 7d367c7e
......@@ -227,6 +227,7 @@
},
"Links": {
"Drives": true,
"PCIeDevice": true,
"StorageControllers": true,
"EthernetInterfaces": true
}
......
......@@ -35,10 +35,10 @@
</ComplexType>
<ComplexType Name="Links" BaseType="Resource.OemObject">
<NavigationProperty Name="Port" Type="Port.Port">
<NavigationProperty Name="Provider" Type="Resource.Item" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="A reference to the Port of a PCIeSwitch on which this function resides."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the Port schema."/>
<Annotation Term="OData.Description" String="The provider of this PCIeFunction. This can either be a PCIeDevice or a Port."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</ComplexType>
......
......@@ -35,10 +35,10 @@
</ComplexType>
<ComplexType Name="Links" BaseType="Resource.OemObject">
<NavigationProperty Name="Port" Type="Port.Port">
<NavigationProperty Name="Provider" Type="Resource.Item" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="A reference to the Port of a PCIeSwitch on which this function resides."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a resource that complies to the Port schema."/>
<Annotation Term="OData.Description" String="The provider of this PCIeFunction. This can either be a PCIeDevice or a Port."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the PCIeDevice or Port schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</ComplexType>
......
......@@ -143,24 +143,24 @@ 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}</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/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/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/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/HSLLInterface/Connections<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/HSLLInterface/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/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/HSLLInterface<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/HSLLInterface</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="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>
<tr><td><a href="pciedevice.html#pciedevice">PCIeDevice</a></td><td>/redfish/v1/PCIeDevices/{PCIeDeviceID}</td></tr>
<tr><td><a href="pciedevicecollection.html#pciedevicecollection">PCIeDeviceCollection</a></td><td>/redfish/v1/PCIeDevices</td></tr>
<tr><td><a href="pciefunction.html#pciefunction">PCIeFunction</a></td><td>/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/PCIeFunctions/{PCIeFunctionID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/PCIeFunctions/{PCIeFunctionID}</td></tr>
<tr><td><a href="pciefunctioncollection.html#pciefunctioncollection">PCIeFunctionCollection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/PCIeFunctions<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/PCIeFunctions<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/PCIeFunctions</td></tr>
<tr><td><a href="port.html#port">Port</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}</td></tr>
<tr><td><a href="pciefunctioncollection.html#pciefunctioncollection">PCIeFunctionCollection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/PCIeFunctions<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/PCIeFunctions</td></tr>
<tr><td><a href="port.html#port">Port</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}</td></tr>
<tr><td><a href="portcollection.html#portcollection">PortCollection</a></td><td>/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts<br />/redfish/v1/Switches/{SwitchID}/Ports</td></tr>
<tr><td><a href="processor.html#processor">Processor</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/Processors/{ProcessorID}</td></tr>
<tr><td><a href="processorcollection.html#processorcollection">ProcessorCollection</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/Processors</td></tr>
<tr><td><a href="serviceroot.html#serviceroot">ServiceRoot</a></td><td>/redfish/v1</td></tr>
<tr><td><a href="switch.html#switch">Switch</a></td><td>/redfish/v1/Switches/{SwitchID}</td></tr>
<tr><td><a href="switchcollection.html#switchcollection">SwitchCollection</a></td><td>/redfish/v1/Switches</td></tr>
<tr><td><a href="vlannetworkinterface.html#vlannetworkinterface">VLanNetworkInterface</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces/{EthernetInterfaceID}/VLANs/{VLanNetworkInterfaceID}<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/VLANs/{VLanNetworkInterfaceID}<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/VLANs/{VLanNetworkInterfaceID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/VLANs/{VLanNetworkInterfaceID}</td></tr>
<tr><td><a href="vlannetworkinterfacecollection.html#vlannetworkinterfacecollection">VLanNetworkInterfaceCollection</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces/{EthernetInterfaceID}/VLANs<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/VLANs<br />/redfish/v1/PCIeDevices/{PCIeDeviceID}/{PCIeFunctionID}/Port/VLANs<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/VLANs</td></tr>
<tr><td><a href="vlannetworkinterface.html#vlannetworkinterface">VLanNetworkInterface</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces/{EthernetInterfaceID}/VLANs/{VLanNetworkInterfaceID}<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/VLANs/{VLanNetworkInterfaceID}<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/VLANs/{VLanNetworkInterfaceID}</td></tr>
<tr><td><a href="vlannetworkinterfacecollection.html#vlannetworkinterfacecollection">VLanNetworkInterfaceCollection</a></td><td>/redfish/v1/Systems/{ComputerSystemID}/EthernetInterfaces/{EthernetInterfaceID}/VLANs<br />/redfish/v1/ComposedNodes/{ComposedNodeID}/ProvidedPorts/{PortID}/VLANs<br />/redfish/v1/Switches/{SwitchID}/Ports/{PortID}/VLANs</td></tr>
</table>
</div>
</body>
......
......@@ -115,14 +115,11 @@ This is the schema definition for the PCIeFunction resource. It represents the
<tr><td>Links {</td><td>object</td><td></td><td></td><td>read-write</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;Oem {</td><td>object</td><td></td><td></td><td>read-write</td><td>Oem extension object.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EID_47597 {</td><td>object</td><td></td><td></td><td>read-only</td><td>RECS|Box PCIeFunction links extension.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Port {</td><td>reference(<a href="port.html#port">Port</a>)</td><td>Yes</td><td></td><td>read-only</td><td>A reference to the Port of a PCIeSwitch on which this function resides.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provider {</td><td>reference</td><td></td><td></td><td>read-only</td><td>The provider of this PCIeFunction. This can either be a PCIeDevice or a Port.</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&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;PCIeDevice {</td><td>reference(<a href="pciedevice.html#pciedevice">PCIeDevice</a>)</td><td>Yes</td><td></td><td>read-only</td><td>A reference to the PCIeDevice on which this function resides.</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>}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>Name</td><td>string</td><td></td><td>GET</td><td>read-only</td><td>The name of the resource or array element.</td></tr>
<tr><td>Oem {</td><td>object</td><td></td><td></td><td>read-write</td><td>This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.</td></tr>
......@@ -204,9 +201,9 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"EID_47597": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Port": {
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Provider": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/PCIeDevices/PCIeDevice1/PCIeFunction1/Port"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "uri"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
<br />
......@@ -214,12 +211,6 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"PCIeDevice": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/PCIeDevices/PCIeDevice1"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Name": "string",
......
......@@ -18,17 +18,10 @@
}
},
"properties": {
"Port": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/Port.json#/definitions/Port"
},
{
"type": "null"
}
],
"description": "A reference to the Port of a PCIeSwitch on which this function resides.",
"longDescription": "This object shall only contain a reference to a resource that complies to the Port schema.",
"Provider": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef",
"description": "The provider of this PCIeFunction. This can either be a PCIeDevice or a Port.",
"longDescription": "This object shall only contain a reference that complies to the PCIeDevice or Port schema.",
"readonly": true
}
},
......
......@@ -18,17 +18,10 @@
}
},
"properties": {
"Port": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/Port.json#/definitions/Port"
},
{
"type": "null"
}
],
"description": "A reference to the Port of a PCIeSwitch on which this function resides.",
"longDescription": "This object shall only contain a reference to a resource that complies to the Port schema.",
"Provider": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/idRef",
"description": "The provider of this PCIeFunction. This can either be a PCIeDevice or a Port.",
"longDescription": "This object shall only contain a reference that complies to the PCIeDevice or Port schema.",
"readonly": true
}
},
......
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