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.

The previous names were never released or used in any other way
outside of WIP patches, so there's no upgrade impact.

Change-Id: Ib81d3a6b312ab7d63df9b5dc97c20d32c3fb214c
Partial-Bug: #1578989
See-Also: I996bf705b14b564106426a2e57299638fb178750
See-Also: https://review.openstack.org/502306 (nova spec)
See-Also: https://review.openstack.org/508149 (neutron spec)
This commit is contained in:
Bence Romsics 2018-11-07 14:15:07 +01:00
parent b5f3bc7f01
commit b2ad10386b
5 changed files with 6 additions and 6 deletions

View File

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

View File

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

View File

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

View File

@ -45,7 +45,7 @@
"qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae",
"resource_request": {
"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"],
"tenant_id": ""

View File

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