Commit e7f314da by Gunnar Billung-Meyer

assemble ComposedNodes without creating HSLLConnections first (created implicitly)

parent 1338e003
......@@ -13,12 +13,6 @@
"ComputerSystem": [
"PATCH"
],
"HSLLConnection": [
"DELETE"
],
"HSLLConnectionCollection": [
"POST"
],
"VLanNetworkInterface": [
"PATCH",
"DELETE"
......
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
<!--# Copyright 2017-2019 christmann informationstechnik + medien GmbH & Co. KG -->
<!--################################################################################ -->
<!---->
<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
<edmx:Include Namespace="Org.OData.Core.V1" Alias="OData" />
</edmx:Reference>
<edmx:Reference Uri="HSLLInterface_v1.xml">
<edmx:Include Namespace="HSLLInterface"/>
</edmx:Reference>
<edmx:DataServices>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComposedNodeAssemblingParameter.v1_0_0">
<ComplexType Name="Connection">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
<Annotation Term="OData.Description" String="The connection within a ComposedNode" />
<NavigationProperty Name="EndpointA" Type="HSLLInterface.HSLLInterface" Nullable="false">
<Annotation Term="OData.Description" String="The first endpoint of this connection"/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the HSLLInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="EndpointB" Type="HSLLInterface.HSLLInterface" Nullable="false">
<Annotation Term="OData.Description" String="The second endpoint of this connection."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the HSLLInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<Property Name="Width" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Description" String="Connection width of the HSLLConnection specified in number of lanes"/>
<Annotation Term="OData.LongDescription" String="The value of this property shall contain the connection width of the HSLLConnection specified in number of lanes."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
</ComplexType>
</Schema>
</edmx:DataServices>
</edmx:Edmx>
......@@ -23,8 +23,8 @@
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
<edmx:Include Namespace="PortCollection"/>
</edmx:Reference>
<edmx:Reference Uri="HSLLConnection_v1.xml">
<edmx:Include Namespace="HSLLConnection"/>
<edmx:Reference Uri="ComposedNodeAssemblingParameter_v1.xml">
<edmx:Include Namespace="ComposedNodeAssemblingParameter.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="HSLLConnectionCollection_v1.xml">
<edmx:Include Namespace="HSLLConnectionCollection"/>
......@@ -50,7 +50,7 @@
<Action Name="Assemble" IsBound="true">
<Parameter Name="ComposedNode" Type="ComposedNode.v1_0_0.Actions"/>
<Parameter Name="Connections" Type="Collection(HSLLConnection.HSLLConnection)"/>
<Parameter Name="Connections" Type="Collection(ComposedNodeAssemblingParameter.v1_0_0.Connection)"/>
<Parameter Name="ResetNetworkSettings" Type="Edm.Boolean">
<Annotation Term="OData.Description" String="If set to true, all network settings within the composed node are reset."/>
</Parameter>
......
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
<!--# Copyright 2017-2019 christmann informationstechnik + medien GmbH & Co. KG -->
<!--################################################################################ -->
<!---->
<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
<edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
<edmx:Include Namespace="Org.OData.Core.V1" Alias="OData" />
</edmx:Reference>
<edmx:Reference Uri="HSLLInterface_v1.xml">
<edmx:Include Namespace="HSLLInterface"/>
</edmx:Reference>
<edmx:DataServices>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComposedNodeAssemblingParameter.v1_0_0">
<ComplexType Name="Connection">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
<Annotation Term="OData.Description" String="The connection within a ComposedNode" />
<NavigationProperty Name="EndpointA" Type="HSLLInterface.HSLLInterface" Nullable="false">
<Annotation Term="OData.Description" String="The first endpoint of this connection"/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the HSLLInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="EndpointB" Type="HSLLInterface.HSLLInterface" Nullable="false">
<Annotation Term="OData.Description" String="The second endpoint of this connection."/>
<Annotation Term="OData.LongDescription" String="This object shall only contain a reference that complies to the HSLLInterface schema."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<Property Name="Width" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Description" String="Connection width of the HSLLConnection specified in number of lanes"/>
<Annotation Term="OData.LongDescription" String="The value of this property shall contain the connection width of the HSLLConnection specified in number of lanes."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
</ComplexType>
</Schema>
</edmx:DataServices>
</edmx:Edmx>
......@@ -23,8 +23,8 @@
<edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
<edmx:Include Namespace="PortCollection"/>
</edmx:Reference>
<edmx:Reference Uri="HSLLConnection_v1.xml">
<edmx:Include Namespace="HSLLConnection"/>
<edmx:Reference Uri="ComposedNodeAssemblingParameter_v1.xml">
<edmx:Include Namespace="ComposedNodeAssemblingParameter.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="HSLLConnectionCollection_v1.xml">
<edmx:Include Namespace="HSLLConnectionCollection"/>
......@@ -50,7 +50,7 @@
<Action Name="Assemble" IsBound="true">
<Parameter Name="ComposedNode" Type="ComposedNode.v1_0_0.Actions"/>
<Parameter Name="Connections" Type="Collection(HSLLConnection.HSLLConnection)"/>
<Parameter Name="Connections" Type="Collection(ComposedNodeAssemblingParameter.v1_0_0.Connection)"/>
<Parameter Name="ResetNetworkSettings" Type="Edm.Boolean">
<Annotation Term="OData.Description" String="If set to true, all network settings within the composed node are reset."/>
</Parameter>
......
......@@ -145,8 +145,14 @@ This is the schema definition for the ComposedNode resource.
<h4 id="parameters">Parameters</h4>
<table class="datatable">
<tr><th>Property</th><th>Type</th><th>Nullable</th><th>Required</th><th>Permission</th><th>Description</th></tr>
<tr><td>Connections [ {</td><td>array[reference(<a href="hsllconnection.html#hsllconnection">HSLLConnection</a>)]</td><td></td><td>POST</td><td>read-write</td><td>This is the schema definition for the HSLLConnection resource.</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>Connections [ {</td><td>array[object]</td><td></td><td>POST</td><td>read-write</td><td>The connection within a ComposedNode</td></tr>
<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;EndpointA {</td><td>reference(<a href="hsllinterface.html#hsllinterface">HSLLInterface</a>)</td><td></td><td></td><td>read-write</td><td>The first endpoint of this connection</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;EndpointB {</td><td>reference(<a href="hsllinterface.html#hsllinterface">HSLLInterface</a>)</td><td></td><td></td><td>read-write</td><td>The second endpoint of this connection.</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;Width</td><td>number</td><td></td><td></td><td>read-write</td><td>Connection width of the HSLLConnection specified in number of lanes<br />Minimum: 0</td></tr>
<tr><td>} ]</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>ResetNetworkSettings</td><td>boolean</td><td></td><td>POST</td><td>read-write</td><td>If set to true, all network settings within the composed node are reset.</td></tr>
</table>
......@@ -160,9 +166,21 @@ Content-Type: application/json
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Connections": [{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"EndpointA": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}],
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Systems/ComputerSystem1/HSLLInterface"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"EndpointB": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/Systems/ComputerSystem1/HSLLInterface"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Width": 0
<br />
&nbsp;&nbsp;&nbsp;&nbsp;}]
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"ResetNetworkSettings": "boolean"
<br />
......
......@@ -166,14 +166,11 @@ HTTP/1.1 405 Method Not Allowed
<br />
</div>
<h3 id="delete">DELETE</h3>
<h4 id="request">Request</h4>
<div class="code">
DELETE /redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1
This operation is not supported on this resource and will result in the following response:
<br />
<br />
</div>
<h4 id="response">Response</h4>
<div class="code">
HTTP/1.1 204 No Content
HTTP/1.1 405 Method Not Allowed
<br />
</div>
</div>
......
......@@ -119,36 +119,11 @@ Content-Type: application/json
<br />
</div>
<h3 id="post">POST</h3>
<h4 id="request">Request</h4>
<div class="code">
POST /redfish/v1/ComposedNodes/ComposedNode1/Connections
<br />
Content-Type: application/json
<br />
{
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"EndpointA": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1/EndpointA"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"EndpointB": {
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"@odata.id": "/redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1/EndpointB"
<br />
&nbsp;&nbsp;&nbsp;&nbsp;},
<br />
&nbsp;&nbsp;&nbsp;&nbsp;"Width": 0
This operation is not supported on this resource and will result in the following response:
<br />
}
<br />
</div>
<h4 id="response">Response</h4>
<div class="code">
HTTP/1.1 201 Created
<br />
Location: http://{IP}:{PORT}/redfish/v1/ComposedNodes/ComposedNode1/Connections/HSLLConnection1
HTTP/1.1 405 Method Not Allowed
<br />
</div>
<h3 id="patch">PATCH</h3>
......
......@@ -40,7 +40,7 @@
"parameters": {
"Connections": {
"items": {
"$ref": "HSLLConnection_v1.xml/HSLLConnection.json#/definitions/HSLLConnection"
"$ref": "ComposedNodeAssemblingParameter_v1.xml/ComposedNodeAssemblingParameter.v1_0_0.json#/definitions/Connection"
},
"type": "array"
},
......
{
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_3_0.json",
"copyright": "Copyright 2014-2017 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
"definitions": {
"Connection": {
"additionalProperties": false,
"description": "The connection within a ComposedNode",
"patternProperties": {
"^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message|Privileges)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
"description": "This property shall specify a valid odata or Redfish property.",
"type": [
"array",
"boolean",
"number",
"null",
"object",
"string"
]
}
},
"properties": {
"EndpointA": {
"$ref": "HSLLInterface_v1.xml/HSLLInterface.json#/definitions/HSLLInterface",
"description": "The first endpoint of this connection",
"longDescription": "This object shall only contain a reference that complies to the HSLLInterface schema."
},
"EndpointB": {
"$ref": "HSLLInterface_v1.xml/HSLLInterface.json#/definitions/HSLLInterface",
"description": "The second endpoint of this connection.",
"longDescription": "This object shall only contain a reference that complies to the HSLLInterface schema."
},
"Width": {
"description": "Connection width of the HSLLConnection specified in number of lanes",
"longDescription": "The value of this property shall contain the connection width of the HSLLConnection specified in number of lanes.",
"minimum": 0,
"type": "number"
}
},
"type": "object"
}
},
"title": "#ComposedNodeAssemblingParameter.v1_0_0"
}
\ No newline at end of file
......@@ -40,7 +40,7 @@
"parameters": {
"Connections": {
"items": {
"$ref": "HSLLConnection_v1.xml/HSLLConnection.json#/definitions/HSLLConnection"
"$ref": "ComposedNodeAssemblingParameter_v1.xml/ComposedNodeAssemblingParameter.v1_0_0.json#/definitions/Connection"
},
"type": "array"
},
......
{
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_3_0.json",
"copyright": "Copyright 2014-2017 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
"definitions": {
"Connection": {
"additionalProperties": false,
"description": "The connection within a ComposedNode",
"patternProperties": {
"^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message|Privileges)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
"description": "This property shall specify a valid odata or Redfish property.",
"type": [
"array",
"boolean",
"number",
"null",
"object",
"string"
]
}
},
"properties": {
"EndpointA": {
"$ref": "HSLLInterface_v1.xml/HSLLInterface.json#/definitions/HSLLInterface",
"description": "The first endpoint of this connection",
"longDescription": "This object shall only contain a reference that complies to the HSLLInterface schema."
},
"EndpointB": {
"$ref": "HSLLInterface_v1.xml/HSLLInterface.json#/definitions/HSLLInterface",
"description": "The second endpoint of this connection.",
"longDescription": "This object shall only contain a reference that complies to the HSLLInterface schema."
},
"Width": {
"description": "Connection width of the HSLLConnection specified in number of lanes",
"longDescription": "The value of this property shall contain the connection width of the HSLLConnection specified in number of lanes.",
"minimum": 0,
"type": "number"
}
},
"type": "object"
}
},
"title": "#ComposedNodeAssemblingParameter.v1_0_0"
}
\ No newline at end of file
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