openstack/neutron-lib
Code Issues Proposed changes

Merge "Adapt to changed resource class names"

Browse Source
This commit is contained in:
Zuul
2018-11-15 15:06:41 +00:00
committed by Gerrit Code Review
parent 7aa78eae72 b2ad10386b
commit 8e1d8bb2c5
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v2/samples/ports/port-bind-create-response.json
View File

@@ -63,7 +63,7 @@
"port_security_enabled": true, "port_security_enabled": true,
"resource_request": { "resource_request": {
"required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"], "required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"],
"resources": {"NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND": 1000} "resources": {"NET_BW_EGR_KILOBIT_PER_SEC": 1000}
} }
} }
} }

2
api-ref/source/v2/samples/ports/port-bind-show-response.json
View File

@@ -52,7 +52,7 @@
"qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae", "qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae",
"resource_request": { "resource_request": {
"required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"], "required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"],
"resources": {"NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND": 1000} "resources": {"NET_BW_EGR_KILOBIT_PER_SEC": 1000}
} }
} }
} }

2
api-ref/source/v2/samples/ports/port-bind-update-response.json
View File

@@ -50,7 +50,7 @@
"port_security_enabled": false, "port_security_enabled": false,
"resource_request": { "resource_request": {
"required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"], "required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"],
"resources": {"NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND": 1000} "resources": {"NET_BW_EGR_KILOBIT_PER_SEC": 1000}
} }
} }
} }

2
api-ref/source/v2/samples/ports/ports-bind-list-response.json
View File

@@ -45,7 +45,7 @@
"qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae", "qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae",
"resource_request": { "resource_request": {
"required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"], "required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"],
"resources": {"NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND": 1000} "resources": {"NET_BW_EGR_KILOBIT_PER_SEC": 1000}
}, },
"tags": ["tag1,tag2"], "tags": ["tag1,tag2"],
"tenant_id": "" "tenant_id": ""

4
neutron_lib/placement/constants.py
View File

@@ -17,8 +17,8 @@ TRAIT_PREFIX_VNIC_TYPE = 'VNIC_TYPE_'
TRAIT_PREFIX_PHYSNET = 'PHYSNET_' TRAIT_PREFIX_PHYSNET = 'PHYSNET_'
# resource classes # resource classes
CLASS_NET_BW_EGRESS_KBPS = 'NET_BANDWIDTH_EGRESS_KILOBITS_PER_SECOND' CLASS_NET_BW_EGRESS_KBPS = 'NET_BW_EGR_KILOBIT_PER_SEC'
CLASS_NET_BW_INGRESS_KBPS = 'NET_BANDWIDTH_INGRESS_KILOBITS_PER_SECOND' CLASS_NET_BW_INGRESS_KBPS = 'NET_BW_IGR_KILOBIT_PER_SEC'
# Optionally reported inventory parameters. Mandatory parameters like 'total' # Optionally reported inventory parameters. Mandatory parameters like 'total'
# are left out intentionally. See also: # are left out intentionally. See also: