openstack/nova
Code Issues Proposed changes

Scrub hw:cpu_model from API samples

Browse Source 
Nova does not support a "hw:cpu_model" flavor extra
spec. This was added as part of microversion 2.47 from
WindRiver where their Titanium Cloud product does support
a hw:cpu_model flavor extra spec. We shouldn't include
this in upstream documentation lest someone be confused
and think upstream nova supports it.

Change-Id: Ie646130731fde648ab84a423024ab59f55f5daab
This commit is contained in:
Matt Riedemann 2018-08-02 16:00:45 -04:00
parent b046a99844
commit 303379fdd7
15 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,6 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
} }

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

@ -36,7 +36,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -37,7 +37,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -17,7 +17,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:cpu_policy": "dedicated", "hw:cpu_policy": "dedicated",
"hw:mem_page_size": "2048" "hw:mem_page_size": "2048"
}, },

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

@ -36,7 +36,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:cpu_policy": "dedicated", "hw:cpu_policy": "dedicated",
"hw:mem_page_size": "2048" "hw:mem_page_size": "2048"
}, },

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

@ -17,7 +17,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:cpu_policy": "dedicated", "hw:cpu_policy": "dedicated",
"hw:mem_page_size": "2048" "hw:mem_page_size": "2048"
}, },

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

@ -37,7 +37,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:cpu_policy": "dedicated", "hw:cpu_policy": "dedicated",
"hw:mem_page_size": "2048" "hw:mem_page_size": "2048"
}, },

1
nova/tests/fixtures.py
View File

@ -667,7 +667,6 @@ 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:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
} }

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

@ -143,7 +143,6 @@
"rxtx_factor": 1.0, "rxtx_factor": 1.0,
"description": null, "description": null,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
} }

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

@ -21,7 +21,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -22,7 +22,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -16,7 +16,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -21,7 +21,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:cpu_policy": "dedicated", "hw:cpu_policy": "dedicated",
"hw:mem_page_size": "2048" "hw:mem_page_size": "2048"
}, },

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

@ -17,7 +17,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },

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

@ -22,7 +22,6 @@
"disk": 1, "disk": 1,
"ephemeral": 0, "ephemeral": 0,
"extra_specs": { "extra_specs": {
"hw:cpu_model": "SandyBridge",
"hw:mem_page_size": "2048", "hw:mem_page_size": "2048",
"hw:cpu_policy": "dedicated" "hw:cpu_policy": "dedicated"
}, },