From 303379fdd7b0ea20d77e19fd9d426342de0e6216 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 2 Aug 2018 16:00:45 -0400 Subject: [PATCH] Scrub hw:cpu_model from API samples 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 --- doc/api_samples/flavors/v2.61/flavors-detail-resp.json | 1 - doc/api_samples/servers/v2.47/server-get-resp.json | 1 - doc/api_samples/servers/v2.47/servers-details-resp.json | 1 - doc/api_samples/servers/v2.63/server-action-rebuild-resp.json | 1 - doc/api_samples/servers/v2.63/server-get-resp.json | 1 - doc/api_samples/servers/v2.63/server-update-resp.json | 1 - doc/api_samples/servers/v2.63/servers-details-resp.json | 1 - nova/tests/fixtures.py | 1 - .../api_samples/flavors/v2.61/flavors-detail-resp.json.tpl | 1 - .../api_samples/servers/v2.47/server-get-resp.json.tpl | 1 - .../api_samples/servers/v2.47/servers-details-resp.json.tpl | 1 - .../servers/v2.63/server-action-rebuild-resp.json.tpl | 1 - .../api_samples/servers/v2.63/server-get-resp.json.tpl | 1 - .../api_samples/servers/v2.63/server-update-resp.json.tpl | 1 - .../api_samples/servers/v2.63/servers-details-resp.json.tpl | 1 - 15 files changed, 15 deletions(-) diff --git a/doc/api_samples/flavors/v2.61/flavors-detail-resp.json b/doc/api_samples/flavors/v2.61/flavors-detail-resp.json index 6325cccaa26d..f615998043f5 100644 --- a/doc/api_samples/flavors/v2.61/flavors-detail-resp.json +++ b/doc/api_samples/flavors/v2.61/flavors-detail-resp.json @@ -143,7 +143,6 @@ "rxtx_factor": 1.0, "description": null, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" } diff --git a/doc/api_samples/servers/v2.47/server-get-resp.json b/doc/api_samples/servers/v2.47/server-get-resp.json index 51dc94949aa0..9983aec3eeac 100644 --- a/doc/api_samples/servers/v2.47/server-get-resp.json +++ b/doc/api_samples/servers/v2.47/server-get-resp.json @@ -36,7 +36,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/doc/api_samples/servers/v2.47/servers-details-resp.json b/doc/api_samples/servers/v2.47/servers-details-resp.json index 11ef8b69a78c..a9aaea4cff4a 100644 --- a/doc/api_samples/servers/v2.47/servers-details-resp.json +++ b/doc/api_samples/servers/v2.47/servers-details-resp.json @@ -37,7 +37,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json b/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json index 151a63538e7f..546e7cb8bb41 100644 --- a/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json +++ b/doc/api_samples/servers/v2.63/server-action-rebuild-resp.json @@ -17,7 +17,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:cpu_policy": "dedicated", "hw:mem_page_size": "2048" }, diff --git a/doc/api_samples/servers/v2.63/server-get-resp.json b/doc/api_samples/servers/v2.63/server-get-resp.json index 85eabf8727e3..5645499fc77a 100644 --- a/doc/api_samples/servers/v2.63/server-get-resp.json +++ b/doc/api_samples/servers/v2.63/server-get-resp.json @@ -36,7 +36,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:cpu_policy": "dedicated", "hw:mem_page_size": "2048" }, diff --git a/doc/api_samples/servers/v2.63/server-update-resp.json b/doc/api_samples/servers/v2.63/server-update-resp.json index b247e1a75268..5a47c0c7cea7 100644 --- a/doc/api_samples/servers/v2.63/server-update-resp.json +++ b/doc/api_samples/servers/v2.63/server-update-resp.json @@ -17,7 +17,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:cpu_policy": "dedicated", "hw:mem_page_size": "2048" }, diff --git a/doc/api_samples/servers/v2.63/servers-details-resp.json b/doc/api_samples/servers/v2.63/servers-details-resp.json index 5ac4083dd504..620a7a223429 100644 --- a/doc/api_samples/servers/v2.63/servers-details-resp.json +++ b/doc/api_samples/servers/v2.63/servers-details-resp.json @@ -37,7 +37,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:cpu_policy": "dedicated", "hw:mem_page_size": "2048" }, diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index f4c68e563d43..df8858918950 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -667,7 +667,6 @@ class DefaultFlavorsFixture(fixtures.Fixture): defaults = {'rxtx_factor': 1.0, 'disabled': False, 'is_public': True, 'ephemeral_gb': 0, 'swap': 0} extra_specs = { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.61/flavors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.61/flavors-detail-resp.json.tpl index 990ba575f0a9..efc74ae6f13a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.61/flavors-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.61/flavors-detail-resp.json.tpl @@ -143,7 +143,6 @@ "rxtx_factor": 1.0, "description": null, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl index e1d30e08dcf2..57fbcb6e47cf 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-get-resp.json.tpl @@ -21,7 +21,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl index dc2cc5db20f5..4fe3770c0e62 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl @@ -22,7 +22,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-action-rebuild-resp.json.tpl index 1df36b257d5d..7b0b9038ce69 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-action-rebuild-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-action-rebuild-resp.json.tpl @@ -16,7 +16,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl index ca5d5bb1eff2..88a533c0a4a0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-get-resp.json.tpl @@ -21,7 +21,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:cpu_policy": "dedicated", "hw:mem_page_size": "2048" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl index b415e59d7ae8..402222ce2925 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl @@ -17,7 +17,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" }, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl index 43366e5a7773..f58a458ecb58 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl @@ -22,7 +22,6 @@ "disk": 1, "ephemeral": 0, "extra_specs": { - "hw:cpu_model": "SandyBridge", "hw:mem_page_size": "2048", "hw:cpu_policy": "dedicated" },