Commit bd65ad5e by Gunnar Billung-Meyer

change HSLLInterface requirements to one interface with respect to the current model

parent ab8b2bd5
......@@ -64,8 +64,8 @@
<Property Name="EthernetInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.EthernetInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more ethernet interfaces" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<Property Name="TotalProcessorCoreCount" Type="Edm.Int64">
<Annotation Term="OData.Description" String="The total amount of processor cores for this system." />
......@@ -93,8 +93,8 @@
<Property Name="PCIeFunctions" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.PCIeFunction)">
<Annotation Term="OData.Description" String="The minimal required set of PCIe functions exposed by the PCIe device" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<NavigationProperty Name="Resource" Type="PCIeDevice.PCIeDevice">
<Annotation Term="OData.Description" String="The URI of a PCIeDevice resource. If this property is set, all other PCIe device requirements are ignored."/>
......@@ -123,8 +123,8 @@
<Property Name="PCIeFunctions" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.PCIeFunction)">
<Annotation Term="OData.Description" String="The minimal required set of PCIe functions exposed by the PCIeSwitch port" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<NavigationProperty Name="Resource" Type="Port.Port">
<Annotation Term="OData.Description" String="The URI of a Port resource, belonging to a PCIeSwitch or a ComposedNode. If this property is set, all other port requirements are ignored."/>
......
......@@ -64,8 +64,8 @@
<Property Name="EthernetInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.EthernetInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more ethernet interfaces" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<Property Name="TotalProcessorCoreCount" Type="Edm.Int64">
<Annotation Term="OData.Description" String="The total amount of processor cores for this system." />
......@@ -93,8 +93,8 @@
<Property Name="PCIeFunctions" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.PCIeFunction)">
<Annotation Term="OData.Description" String="The minimal required set of PCIe functions exposed by the PCIe device" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<NavigationProperty Name="Resource" Type="PCIeDevice.PCIeDevice">
<Annotation Term="OData.Description" String="The URI of a PCIeDevice resource. If this property is set, all other PCIe device requirements are ignored."/>
......@@ -123,8 +123,8 @@
<Property Name="PCIeFunctions" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.PCIeFunction)">
<Annotation Term="OData.Description" String="The minimal required set of PCIe functions exposed by the PCIeSwitch port" />
</Property>
<Property Name="HSLLInterfaces" Type="Collection(ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface)">
<Annotation Term="OData.Description" String="The requirements for one or more HSLL interfaces" />
<Property Name="HSLLInterface" Type="ComposedNodeAllocationRequirement.v1_0_0.HSLLInterface">
<Annotation Term="OData.Description" String="The requirements for a HSLL interface" />
</Property>
<NavigationProperty Name="Resource" Type="Port.Port">
<Annotation Term="OData.Description" String="The URI of a Port resource, belonging to a PCIeSwitch or a ComposedNode. If this property is set, all other port requirements are ignored."/>
......
......@@ -62,19 +62,16 @@
],
"description": "The Baseboard where applicable resources are located"
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"PCIeFunctions": {
"description": "The minimal required set of PCIe functions exposed by the PCIe device",
......@@ -476,19 +473,16 @@
"null"
]
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"MaxSpeedGbps": {
"description": "The minimal value of the maximum speed of the port",
......@@ -663,19 +657,16 @@
},
"type": "array"
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"Processors": {
"description": "The requirements for one or more processors",
......
......@@ -62,19 +62,16 @@
],
"description": "The Baseboard where applicable resources are located"
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"PCIeFunctions": {
"description": "The minimal required set of PCIe functions exposed by the PCIe device",
......@@ -476,19 +473,16 @@
"null"
]
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"MaxSpeedGbps": {
"description": "The minimal value of the maximum speed of the port",
......@@ -663,19 +657,16 @@
},
"type": "array"
},
"HSLLInterfaces": {
"description": "The requirements for one or more HSLL interfaces",
"items": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
]
},
"type": "array"
"HSLLInterface": {
"anyOf": [
{
"$ref": "#/definitions/HSLLInterface"
},
{
"type": "null"
}
],
"description": "The requirements for a HSLL interface"
},
"Processors": {
"description": "The requirements for one or more processors",
......
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