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

2019-08-28 16:12:39 +00:00
parent 1066561eba b01676c418
commit 67ee187c06
20 changed files with 21 additions and 42 deletions
--- a/api-guide/source/down_cells.rst
+++ b/api-guide/source/down_cells.rst
@@ -130,8 +130,7 @@ behavior are described below:
                       "disk": 1,
                       "ephemeral": 0,
                       "extra_specs": {
-                           "hw:cpu_policy": "dedicated",
-                           "hw:mem_page_size": "2048"
+                           "hw:numa_nodes": "1"
                       },
                       "original_name": "m1.tiny.specs",
                       "ram": 512,
@@ -266,8 +265,7 @@ behavior are described below:
                     "disk": 1,
                     "ephemeral": 0,
                     "extra_specs": {
-                         "hw:cpu_policy": "dedicated",
-                         "hw:mem_page_size": "2048"
+                         "hw:numa_nodes": "1"
                     },
                     "original_name": "m1.tiny.specs",
                     "ram": 512,
--- a/doc/api_samples/flavors/v2.61/flavors-detail-resp.json
+++ b/doc/api_samples/flavors/v2.61/flavors-detail-resp.json
@@ -143,8 +143,7 @@
            "rxtx_factor": 1.0,
            "description": null,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            }
        },
        {
--- a/doc/api_samples/flavors/v2.75/flavors-detail-resp.json
+++ b/doc/api_samples/flavors/v2.75/flavors-detail-resp.json
@@ -143,8 +143,7 @@
            "rxtx_factor": 1.0,
            "description": null,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            }
        },
        {
--- a/doc/api_samples/servers/v2.47/server-get-resp.json
+++ b/doc/api_samples/servers/v2.47/server-get-resp.json
@@ -36,8 +36,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- a/doc/api_samples/servers/v2.47/servers-details-resp.json
+++ b/doc/api_samples/servers/v2.47/servers-details-resp.json
@@ -37,8 +37,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:mem_page_size": "2048",
-                    "hw:cpu_policy": "dedicated"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,
--- 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,8 +17,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:cpu_policy": "dedicated",
-                "hw:mem_page_size": "2048"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- a/doc/api_samples/servers/v2.63/server-get-resp.json
+++ b/doc/api_samples/servers/v2.63/server-get-resp.json
@@ -36,8 +36,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:cpu_policy": "dedicated",
-                "hw:mem_page_size": "2048"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- a/doc/api_samples/servers/v2.63/server-update-resp.json
+++ b/doc/api_samples/servers/v2.63/server-update-resp.json
@@ -17,8 +17,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:cpu_policy": "dedicated",
-                "hw:mem_page_size": "2048"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- a/doc/api_samples/servers/v2.63/servers-details-resp.json
+++ b/doc/api_samples/servers/v2.63/servers-details-resp.json
@@ -37,8 +37,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:cpu_policy": "dedicated",
-                    "hw:mem_page_size": "2048"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,
--- a/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json
+++ b/doc/api_samples/servers/v2.66/servers-details-with-changes-before.json
@@ -37,8 +37,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:cpu_policy": "dedicated",
-                    "hw:mem_page_size": "2048"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -739,8 +739,7 @@ class DefaultFlavorsFixture(fixtures.Fixture):
        defaults = {'rxtx_factor': 1.0, 'disabled': False, 'is_public': True,
                    'ephemeral_gb': 0, 'swap': 0}
        extra_specs = {
-            "hw:mem_page_size": "2048",
-            "hw:cpu_policy": "dedicated"
+            "hw:numa_nodes": "1"
        }
        default_flavors = [
            objects.Flavor(context=ctxt, memory_mb=512, vcpus=1,
--- 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,8 +143,7 @@
            "rxtx_factor": 1.0,
            "description": null,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            }
        },
        {
--- a/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.75/flavors-detail-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/flavors/v2.75/flavors-detail-resp.json.tpl
@@ -143,8 +143,7 @@
            "rxtx_factor": 1.0,
            "description": null,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            }
        },
        {
--- 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,8 +21,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- 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,8 +22,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:mem_page_size": "2048",
-                    "hw:cpu_policy": "dedicated"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,
--- 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,8 +16,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:mem_page_size": "2048",
-                "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- 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,8 +21,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                "hw:cpu_policy": "dedicated",
-                "hw:mem_page_size": "2048"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- 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,8 +17,7 @@
            "disk": 1,
            "ephemeral": 0,
            "extra_specs": {
-                    "hw:mem_page_size": "2048",
-                    "hw:cpu_policy": "dedicated"
+                "hw:numa_nodes": "1"
            },
            "original_name": "m1.tiny.specs",
            "ram": 512,
--- 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,8 +22,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:mem_page_size": "2048",
-                    "hw:cpu_policy": "dedicated"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,
--- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.66/servers-details-with-changes-before.json.tpl
@@ -22,8 +22,7 @@
                "disk": 1,
                "ephemeral": 0,
                "extra_specs": {
-                    "hw:mem_page_size": "2048",
-                    "hw:cpu_policy": "dedicated"
+                    "hw:numa_nodes": "1"
                },
                "original_name": "m1.tiny.specs",
                "ram": 512,