openstack/nova
Code Issues Proposed changes

Remove 'hw:cpu_policy', 'hw:mem_page_size' extra specs from API samples

Browse Source 
In a future change, the use of 'hw:cpu_policy' will require a host to
report PCPU inventory. Rather than modify the fake driver used in these
tests to report such inventory, just use a different extra spec,
'hw:numa_nodes'. This has the added bonus of being supported by both the
libvirt and Hyper-V virt drivers, unlike 'hw:cpu_policy' and
'hw:mem_page_size', which are only supported by the libvirt virt driver.

Change-Id: Id203dc07f08557b1b094ec72e1df3493ec9524b1
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2019-08-08 10:40:14 +01:00
parent 7abe83f646
commit b01676c418
20 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api-guide/source/down_cells.rst
View File

@@ -130,8 +130,7 @@ behavior are described below:
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,
@@ -266,8 +265,7 @@ behavior are described below:
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/flavors/v2.61/flavors-detail-resp.json
View File

@@ -143,8 +143,7 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
} }
}, },
{ {

3
doc/api_samples/flavors/v2.75/flavors-detail-resp.json
View File

@@ -143,8 +143,7 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
} }
}, },
{ {

3
doc/api_samples/servers/v2.47/server-get-resp.json
View File

@@ -36,8 +36,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.47/servers-details-resp.json
View File

@@ -37,8 +37,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.63/server-action-rebuild-resp.json
View File

@@ -17,8 +17,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.63/server-get-resp.json
View File

@@ -36,8 +36,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.63/server-update-resp.json
View File

@@ -17,8 +17,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.63/servers-details-resp.json
View File

@@ -37,8 +37,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
doc/api_samples/servers/v2.66/servers-details-with-changes-before.json
View File

@@ -37,8 +37,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/fixtures.py
View File

@@ -739,8 +739,7 @@ class DefaultFlavorsFixture(fixtures.Fixture):
defaults = {'rxtx_factor': 1.0, 'disabled': False, 'is_public': True, defaults = {'rxtx_factor': 1.0, 'disabled': False, 'is_public': True,
'ephemeral_gb': 0, 'swap': 0} 'ephemeral_gb': 0, 'swap': 0}
extra_specs = { extra_specs = {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
} }
default_flavors = [ default_flavors = [
objects.Flavor(context=ctxt, memory_mb=512, vcpus=1, objects.Flavor(context=ctxt, memory_mb=512, vcpus=1,

3
nova/tests/functional/api_sample_tests/api_samples/flavors/v2.61/flavors-detail-resp.json.tpl
View File

@@ -143,8 +143,7 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
} }
}, },
{ {

3
nova/tests/functional/api_sample_tests/api_samples/flavors/v2.75/flavors-detail-resp.json.tpl
View File

@@ -143,8 +143,7 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
} }
}, },
{ {

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl
View File

@@ -21,8 +21,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl
View File

@@ -22,8 +22,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-action-rebuild-resp.json.tpl
View File

@@ -16,8 +16,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl
View File

@@ -21,8 +21,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_policy": "dedicated", "hw:numa_nodes": "1"
"hw:mem_page_size": "2048"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl
View File

@@ -17,8 +17,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl
View File

@@ -22,8 +22,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,

3
nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl
View File

@@ -22,8 +22,7 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:mem_page_size": "2048", "hw:numa_nodes": "1"
"hw:cpu_policy": "dedicated"
}, },
"original_name": "m1.tiny.specs", "original_name": "m1.tiny.specs",
"ram": 512, "ram": 512,