Commit df0a04b9 by Gunnar Billung-Meyer

remove PrimaryVLAN from EthernetInterface in ComposedNode allocation requirements

parent bd65ad5e
......@@ -241,9 +241,6 @@
<Annotation Term="OData.Description" String="The minimum speed of the ethernet interface" />
<Annotation Term="Measures.Unit" String="Mbit/s"/>
</Property>
<Property Name="PrimaryVLAN" Type="VLanNetworkInterface.v1_0_0.VLANId">
<Annotation Term="OData.Description" String="The primary VLAN ID of the ethernet interface" />
</Property>
<Property Name="VLANs" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.VLAN)">
<Annotation Term="OData.Description" String="The VLANs of the ethernet interface" />
</Property>
......
......@@ -241,9 +241,6 @@
<Annotation Term="OData.Description" String="The minimum speed of the ethernet interface" />
<Annotation Term="Measures.Unit" String="Mbit/s"/>
</Property>
<Property Name="PrimaryVLAN" Type="VLanNetworkInterface.v1_0_0.VLANId">
<Annotation Term="OData.Description" String="The primary VLAN ID of the ethernet interface" />
</Property>
<Property Name="VLANs" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.VLAN)">
<Annotation Term="OData.Description" String="The VLANs of the ethernet interface" />
</Property>
......
......@@ -101,7 +101,6 @@ table { border-collapse: collapse; }
<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;EthernetInterfaces [ {</td><td>array[object]</td><td></td><td></td><td>read-write</td><td>The requirements for one or more ethernet interfaces</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PrimaryVLAN</td><td>number</td><td>Yes</td><td></td><td>read-write</td><td>The primary VLAN ID of the ethernet interface<br />Minimum: 0<br />Maximum: 4094</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Resource {</td><td>reference(<a href="ethernetinterface.html#ethernetinterface">EthernetInterface</a>)</td><td>Yes</td><td></td><td>read-write</td><td>The URI of a EthernetInterface resource. If this property is set, all other ethernet interface requirements are ignored.</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>
......@@ -287,8 +286,6 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"EthernetInterfaces": [{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"PrimaryVLAN": 0,
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Resource": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Systems/ComputerSystem1/EthernetInterfaces/EthernetInterface1"
......
......@@ -137,17 +137,6 @@
}
},
"properties": {
"PrimaryVLAN": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterface.v1_0_0.json#/definitions/VLANId"
},
{
"type": "null"
}
],
"description": "The primary VLAN ID of the ethernet interface"
},
"Resource": {
"anyOf": [
{
......
......@@ -137,17 +137,6 @@
}
},
"properties": {
"PrimaryVLAN": {
"anyOf": [
{
"$ref": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterface.v1_0_0.json#/definitions/VLANId"
},
{
"type": "null"
}
],
"description": "The primary VLAN ID of the ethernet interface"
},
"Resource": {
"anyOf": [
{
......
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