From 4d3d98be2930230d0707ecb87ac3f80331420461 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Mon, 17 Apr 2017 19:04:29 -0700 Subject: [PATCH] Remove json-schema extension variable for resize schema_servers.base_xxx was for extending json-schema for API extensions, however the json-schema of resize is not extended at all since the first commit I3651da8c1d23ee1b5d4710b1b323ecf9337ca70d So this patch removes the variable for easy code. Partial-implement-blueprint api-no-more-extensions-pike Change-Id: I2b9c31d177943d728fa51848f6f824b9918744a6 --- nova/api/openstack/compute/schemas/servers.py | 2 +- nova/api/openstack/compute/servers.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nova/api/openstack/compute/schemas/servers.py b/nova/api/openstack/compute/schemas/servers.py index 0c7fd0e84371..3a17b38d76dc 100644 --- a/nova/api/openstack/compute/schemas/servers.py +++ b/nova/api/openstack/compute/schemas/servers.py @@ -189,7 +189,7 @@ base_rebuild_v219 = copy.deepcopy(base_rebuild) base_rebuild_v219['properties']['rebuild'][ 'properties']['description'] = parameter_types.description -base_resize = { +resize = { 'type': 'object', 'properties': { 'resize': { diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index a596a828c043..92c2ba2e00b7 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -71,7 +71,6 @@ class ServersController(wsgi.Controller): schema_server_create = schema_servers.base_create schema_server_update = schema_servers.base_update schema_server_rebuild = schema_servers.base_rebuild - schema_server_resize = schema_servers.base_resize schema_server_create_v20 = schema_servers.base_create_v20 schema_server_update_v20 = schema_servers.base_update_v20 @@ -877,7 +876,7 @@ class ServersController(wsgi.Controller): @wsgi.response(202) @extensions.expected_errors((400, 401, 403, 404, 409)) @wsgi.action('resize') - @validation.schema(schema_server_resize) + @validation.schema(schema_servers.resize) def _action_resize(self, req, id, body): """Resizes a given instance to the flavor size requested.""" resize_dict = body['resize']