summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBence Romsics <bence.romsics@ericsson.com>2018-11-13 16:48:02 +0100
committerBence Romsics <bence.romsics@ericsson.com>2018-11-13 16:48:02 +0100
commit2af53625e7a2e39e53db394f97328e6427cd9fb9 (patch)
tree574165851765f14bd4f291823527e8926e3207fc
parent3cdf4b8ae7a8e7b6613f749843a4cf74720faab1 (diff)
Adapt to changed resource class names
Before the final merge of the minimum bandwidth resource classes they got renamed in Nova and Placement. So we have to adapt. This change retroactively updates the spec. Change-Id: Ia347c71381ec2fd82a1b197f5d0fbed69a70ad70 Partial-Bug: #1578989 See-Also: I996bf705b14b564106426a2e57299638fb178750 See-Also: https://review.openstack.org/616194
Notes
Notes (review): Code-Review+2: Brian Haley <haleyb.dev@gmail.com> Code-Review+2: Slawek Kaplonski <skaplons@redhat.com> Workflow+1: Slawek Kaplonski <skaplons@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 13 Nov 2018 21:34:09 +0000 Reviewed-on: https://review.openstack.org/617711 Project: openstack/neutron-specs Branch: refs/heads/master
-rw-r--r--specs/rocky/minimum-bandwidth-allocation-placement-api.rst28
1 files changed, 14 insertions, 14 deletions
diff --git a/specs/rocky/minimum-bandwidth-allocation-placement-api.rst b/specs/rocky/minimum-bandwidth-allocation-placement-api.rst
index 4ce5098..16bbf7c 100644
--- a/specs/rocky/minimum-bandwidth-allocation-placement-api.rst
+++ b/specs/rocky/minimum-bandwidth-allocation-placement-api.rst
@@ -204,8 +204,8 @@ Figure: resource_request in the port
204 "device_id": "5e3898d7-11be-483e-9732-b2f5eccd2b2e", 204 "device_id": "5e3898d7-11be-483e-9732-b2f5eccd2b2e",
205 "resource_request": { 205 "resource_request": {
206 "resources": { 206 "resources": {
207 "NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND": 1000, 207 "NET_BW_IGR_KILOBIT_PER_SEC": 1000,
208 "NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND": 1000 }, 208 "NET_BW_EGR_KILOBIT_PER_SEC": 1000 },
209 "required": ["CUSTOM_PHYSNET_NET0", "CUSTOM_VNIC_TYPE_NORMAL"]} 209 "required": ["CUSTOM_PHYSNET_NET0", "CUSTOM_VNIC_TYPE_NORMAL"]}
210 }} 210 }}
211 211
@@ -324,15 +324,15 @@ Figure: networking RP model
324 | | uuid = uuid5(hostname:br0) 324 | | uuid = uuid5(hostname:br0)
325 | | traits: CUSTOM_PHYSNET_1, CUSTOM_VNIC_TYPE_NORMAL 325 | | traits: CUSTOM_PHYSNET_1, CUSTOM_VNIC_TYPE_NORMAL
326 | | inventory: 326 | | inventory:
327 | | {NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 327 | | {NET_BW_IGR_KILOBIT_PER_SEC: 10000,
328 | | NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 328 | | NET_BW_EGR_KILOBIT_PER_SEC: 10000}
329 | | 329 | |
330 | +------+Physical network interface RP, 330 | +------+Physical network interface RP,
331 | uuid = uuid5(hostname:br1) 331 | uuid = uuid5(hostname:br1)
332 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_NORMAL 332 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_NORMAL
333 | inventory: 333 | inventory:
334 | {NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 334 | {NET_BW_IGR_KILOBIT_PER_SEC: 10000,
335 | NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 335 | NET_BW_EGR_KILOBIT_PER_SEC: 10000}
336 | 336 |
337 +-------+Network agent RP (for LinuxBridge agent), uuid = agent_uuid 337 +-------+Network agent RP (for LinuxBridge agent), uuid = agent_uuid
338 | + 338 | +
@@ -341,8 +341,8 @@ Figure: networking RP model
341 | uuid = uuid5(hostname:virbr0) 341 | uuid = uuid5(hostname:virbr0)
342 | traits: CUSTOM_PHYSNET_1, CUSTOM_VNIC_TYPE_NORMAL 342 | traits: CUSTOM_PHYSNET_1, CUSTOM_VNIC_TYPE_NORMAL
343 | inventory: 343 | inventory:
344 | {NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 344 | {NET_BW_IGR_KILOBIT_PER_SEC: 10000,
345 | NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 345 | NET_BW_EGR_KILOBIT_PER_SEC: 10000}
346 | 346 |
347 +-------+Network agent RP (for SRIOV agent), uuid = agent_uuid 347 +-------+Network agent RP (for SRIOV agent), uuid = agent_uuid
348 + 348 +
@@ -352,24 +352,24 @@ Figure: networking RP model
352 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_DIRECT 352 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_DIRECT
353 | inventory: 353 | inventory:
354 | {VF: 8, # VF resource is out of scope 354 | {VF: 8, # VF resource is out of scope
355 | NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 355 | NET_BW_IGR_KILOBIT_PER_SEC: 10000,
356 | NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 356 | NET_BW_EGR_KILOBIT_PER_SEC: 10000}
357 | 357 |
358 +------+Physical network interface RP, 358 +------+Physical network interface RP,
359 | uuid = uuid5(hostname:eth1) 359 | uuid = uuid5(hostname:eth1)
360 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_DIRECT 360 | traits: CUSTOM_PHYSNET_2, CUSTOM_VNIC_TYPE_DIRECT
361 | inventory: 361 | inventory:
362 | {VF: 8, # VF resource is out of scope 362 | {VF: 8, # VF resource is out of scope
363 | NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 363 | NET_BW_IGR_KILOBIT_PER_SEC: 10000,
364 | NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 364 | NET_BW_EGR_KILOBIT_PER_SEC: 10000}
365 | 365 |
366 +------+Physical network interface RP, 366 +------+Physical network interface RP,
367 uuid = uuid5(hostname:eth2) 367 uuid = uuid5(hostname:eth2)
368 traits: CUSTOM_PHYSNET_3, CUSTOM_VNIC_TYPE_DIRECT 368 traits: CUSTOM_PHYSNET_3, CUSTOM_VNIC_TYPE_DIRECT
369 inventory: 369 inventory:
370 {VF: 8, # VF resource is out of scope 370 {VF: 8, # VF resource is out of scope
371 NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND: 10000, 371 NET_BW_IGR_KILOBIT_PER_SEC: 10000,
372 NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND: 10000} 372 NET_BW_EGR_KILOBIT_PER_SEC: 10000}
373 373
374Custom traits will be used to indicate which physical network a given 374Custom traits will be used to indicate which physical network a given
375Physical network interface RP is connected to, as previously described. 375Physical network interface RP is connected to, as previously described.