Merge "Scrub hw:cpu_model from API samples"

Zuul · openstack-gerrit · commit 3ac6deb94c5a · 2018-08-03T13:19:28.000Z
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -667,7 +667,6 @@ def setUp(self):
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,7 +22,6 @@
                 "disk": 1,
                 "ephemeral": 0,
                 "extra_specs": {
-                    "hw:cpu_model": "SandyBridge",
                     "hw:mem_page_size": "2048",
                     "hw:cpu_policy": "dedicated"
                 },

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@`
`143`	`143`	`"rxtx_factor": 1.0,`
`144`	`144`	`"description": null,`
`145`	`145`	`"extra_specs": {`
`146`		`- "hw:cpu_model": "SandyBridge",`
`147`	`146`	`"hw:mem_page_size": "2048",`
`148`	`147`	`"hw:cpu_policy": "dedicated"`
`149`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,6 @@ def setUp(self):`
`667`	`667`	`defaults = {'rxtx_factor': 1.0, 'disabled': False, 'is_public': True,`
`668`	`668`	`'ephemeral_gb': 0, 'swap': 0}`
`669`	`669`	`extra_specs = {`
`670`		`- "hw:cpu_model": "SandyBridge",`
`671`	`670`	`"hw:mem_page_size": "2048",`
`672`	`671`	`"hw:cpu_policy": "dedicated"`
`673`	`672`	`}`