Commit f96c0d36 by Gunnar Billung-Meyer

add ServiceRoot.VLANs

parent fa9e32ac
......@@ -28,6 +28,9 @@
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SwitchCollection_v1.xml">
<edmx:Include Namespace="SwitchCollection"/>
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VLanNetworkInterfaceCollection_v1.xml">
<edmx:Include Namespace="VLanNetworkInterfaceCollection"/>
</edmx:Reference>
<edmx:DataServices>
......@@ -64,6 +67,12 @@
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the Switch schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="VLANs" Type="VLanNetworkInterfaceCollection.VLanNetworkInterfaceCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to a collection of VLanNetworkInterfaces."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the VLanNetworkInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
<Annotation Term="OData.Description" String="RECS|Box ServiceRoot extension"/>
<Annotation Term="OData.LongDescription" String="RECS|Box ServiceRoot extension" />
......
......@@ -28,6 +28,9 @@
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SwitchCollection_v1.xml">
<edmx:Include Namespace="SwitchCollection"/>
</edmx:Reference>
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VLanNetworkInterfaceCollection_v1.xml">
<edmx:Include Namespace="VLanNetworkInterfaceCollection"/>
</edmx:Reference>
<edmx:DataServices>
......@@ -64,6 +67,12 @@
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the Switch schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="VLANs" Type="VLanNetworkInterfaceCollection.VLanNetworkInterfaceCollection" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="This is a link to a collection of VLanNetworkInterfaces."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference to a collection of resources that comply to the VLanNetworkInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
<Annotation Term="OData.Description" String="RECS|Box ServiceRoot extension"/>
<Annotation Term="OData.LongDescription" String="RECS|Box ServiceRoot extension" />
......
......@@ -159,8 +159,8 @@ All other referred versions, such as JSON, ODATA and SSDP, are corresponding to
<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/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>
<tr><td><a href="vlannetworkinterface.html#vlannetworkinterface">VLanNetworkInterface</a></td><td>/redfish/v1/VLANs/{VLanNetworkInterfaceID}</td></tr>
<tr><td><a href="vlannetworkinterfacecollection.html#vlannetworkinterfacecollection">VLanNetworkInterfaceCollection</a></td><td>/redfish/v1/VLANs<br />/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>
......
......@@ -102,6 +102,9 @@ This object represents the root Redfish service.
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Switches {</td><td>reference(<a href="switchcollection.html#switchcollection">SwitchCollection</a>)</td><td></td><td></td><td>read-only</td><td>This is a link to a collection of Ethernet- and PCIeSwitches.</td></tr>
<tr><td>&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;}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;VLANs {</td><td>reference(<a href="vlannetworkinterfacecollection.html#vlannetworkinterfacecollection">VLanNetworkInterfaceCollection</a>)</td><td></td><td></td><td>read-only</td><td>This is a link to a collection of VLanNetworkInterfaces.</td></tr>
<tr><td>&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;}</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>}</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>RedfishVersion</td><td>string</td><td></td><td></td><td>read-only</td><td>The version of the Redfish service.<br />Pattern: ^\d+\.\d+\.\d+$</td></tr>
......@@ -181,6 +184,12 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Switches"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"VLANs": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/VLANs"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
......
......@@ -93,7 +93,7 @@ This resource describes the attributes of a Virtual LAN.
<h3 id="get">GET</h3>
<h4 id="request">Request</h4>
<div class="code">
GET /redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs/VLanNetworkInterface1
GET /redfish/v1/VLANs/VLanNetworkInterface1
<br />
Content-Type: application/json
<br />
......@@ -104,7 +104,7 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.context": "uri",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs/VLanNetworkInterface1",
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/VLANs/VLanNetworkInterface1",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.type": "string",
<br />
......@@ -148,7 +148,7 @@ HTTP/1.1 405 Method Not Allowed
<h3 id="patch">PATCH</h3>
<h4 id="request">Request</h4>
<div class="code">
PATCH /redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs/VLanNetworkInterface1
PATCH /redfish/v1/VLANs/VLanNetworkInterface1
<br />
Content-Type: application/json
<br />
......@@ -179,7 +179,7 @@ HTTP/1.1 204 No Content
<h3 id="delete">DELETE</h3>
<h4 id="request">Request</h4>
<div class="code">
DELETE /redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs/VLanNetworkInterface1
DELETE /redfish/v1/VLANs/VLanNetworkInterface1
<br />
</div>
<h4 id="response">Response</h4>
......
......@@ -87,7 +87,7 @@ A Collection of VLanNetworkInterface resource instances.
<h3 id="get">GET</h3>
<h4 id="request">Request</h4>
<div class="code">
GET /redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs
GET /redfish/v1/VLANs
<br />
Content-Type: application/json
<br />
......@@ -98,7 +98,7 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.context": "uri",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs",
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/VLANs",
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"@odata.type": "string",
<br />
......@@ -106,7 +106,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/VLANs/VLanNetworkInterface1"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/VLANs/VLanNetworkInterface1"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}],
<br />
......@@ -122,7 +122,7 @@ Content-Type: application/json
<h3 id="post">POST</h3>
<h4 id="request">Request</h4>
<div class="code">
POST /redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs
POST /redfish/v1/VLANs
<br />
Content-Type: application/json
<br />
......@@ -149,7 +149,7 @@ Content-Type: application/json
<div class="code">
HTTP/1.1 201 Created
<br />
Location: http://{IP}:{PORT}/redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1/VLANs/VLanNetworkInterface1
Location: http://{IP}:{PORT}/redfish/v1/VLANs/VLanNetworkInterface1
<br />
</div>
<h3 id="patch">PATCH</h3>
......
......@@ -50,6 +50,12 @@
"description": "This is a link to a collection of Ethernet- and PCIeSwitches.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the Switch schema.",
"readonly": true
},
"VLANs": {
"$ref": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterfaceCollection.json#/definitions/VLanNetworkInterfaceCollection",
"description": "This is a link to a collection of VLanNetworkInterfaces.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the VLanNetworkInterface schema.",
"readonly": true
}
},
"type": "object"
......
......@@ -50,6 +50,12 @@
"description": "This is a link to a collection of Ethernet- and PCIeSwitches.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the Switch schema.",
"readonly": true
},
"VLANs": {
"$ref": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterfaceCollection.json#/definitions/VLanNetworkInterfaceCollection",
"description": "This is a link to a collection of VLanNetworkInterfaces.",
"longDescription": "This object shall only contain a reference to a collection of resources that comply to the VLanNetworkInterface schema.",
"readonly": true
}
},
"type": "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