diff --git a/doc/source/microversion_testing.rst b/doc/source/microversion_testing.rst index eaab168b27..b4f06e3f25 100644 --- a/doc/source/microversion_testing.rst +++ b/doc/source/microversion_testing.rst @@ -410,6 +410,10 @@ Microversion tests implemented in Tempest .. _2.70: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#id63 + * `2.71`_ + + .. _2.71: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#id64 + * Volume * `3.3`_ diff --git a/tempest/lib/api_schema/response/compute/v2_71/__init__.py b/tempest/lib/api_schema/response/compute/v2_71/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/lib/api_schema/response/compute/v2_71/servers.py b/tempest/lib/api_schema/response/compute/v2_71/servers.py new file mode 100644 index 0000000000..0c526fb3cd --- /dev/null +++ b/tempest/lib/api_schema/response/compute/v2_71/servers.py @@ -0,0 +1,81 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import copy + +from tempest.lib.api_schema.response.compute.v2_70 import servers as servers270 + + +########################################################################### +# +# 2.71: +# +# The server_groups parameter will be in the response body of the following +# APIs to list the server groups to which the server belongs: +# +# - GET /servers/{server_id} (show) +# - PUT /servers/{server_id} (update) +# - POST /servers/{server_id}/action (rebuild) +# +########################################################################### + +# The "server_groups" parameter will always be present and contain at most one +# UUID entry. +server_groups = { + 'type': 'array', + 'minItems': 0, + 'maxItems': 1, + 'items': { + 'type': 'string', + 'format': 'uuid' + } +} + +rebuild_server = copy.deepcopy(servers270.rebuild_server) +rebuild_server['response_body']['properties']['server'][ + 'properties'].update({'server_groups': server_groups}) +rebuild_server['response_body']['properties']['server'][ + 'required'].append('server_groups') + +rebuild_server_with_admin_pass = copy.deepcopy( + servers270.rebuild_server_with_admin_pass) +rebuild_server_with_admin_pass['response_body']['properties']['server'][ + 'properties'].update({'server_groups': server_groups}) +rebuild_server_with_admin_pass['response_body']['properties']['server'][ + 'required'].append('server_groups') + +update_server = copy.deepcopy(servers270.update_server) +update_server['response_body']['properties']['server'][ + 'properties'].update({'server_groups': server_groups}) +update_server['response_body']['properties']['server'][ + 'required'].append('server_groups') + +get_server = copy.deepcopy(servers270.get_server) +get_server['response_body']['properties']['server'][ + 'properties'].update({'server_groups': server_groups}) +get_server['response_body']['properties']['server'][ + 'required'].append('server_groups') + +# NOTE(lajoskatona): Below are the unchanged schema in this microversion. We +# need to keep this schema in this file to have the generic way to select the +# right schema based on self.schema_versions_info mapping in service client. +# ****** Schemas unchanged since microversion 2.70 *** +list_servers_details = copy.deepcopy(servers270.list_servers_detail) +list_servers = copy.deepcopy(servers270.list_servers) +show_server_diagnostics = copy.deepcopy(servers270.show_server_diagnostics) +get_remote_consoles = copy.deepcopy(servers270.get_remote_consoles) +list_tags = copy.deepcopy(servers270.list_tags) +update_all_tags = copy.deepcopy(servers270.update_all_tags) +delete_all_tags = copy.deepcopy(servers270.delete_all_tags) +check_tag_existence = copy.deepcopy(servers270.check_tag_existence) +update_tag = copy.deepcopy(servers270.update_tag) +delete_tag = copy.deepcopy(servers270.delete_tag) diff --git a/tempest/lib/services/compute/servers_client.py b/tempest/lib/services/compute/servers_client.py index b81a3f857b..f2270f83e8 100644 --- a/tempest/lib/services/compute/servers_client.py +++ b/tempest/lib/services/compute/servers_client.py @@ -34,6 +34,7 @@ from tempest.lib.api_schema.response.compute.v2_57 import servers as schemav257 from tempest.lib.api_schema.response.compute.v2_6 import servers as schemav26 from tempest.lib.api_schema.response.compute.v2_63 import servers as schemav263 from tempest.lib.api_schema.response.compute.v2_70 import servers as schemav270 +from tempest.lib.api_schema.response.compute.v2_71 import servers as schemav271 from tempest.lib.api_schema.response.compute.v2_8 import servers as schemav28 from tempest.lib.api_schema.response.compute.v2_9 import servers as schemav29 from tempest.lib.common import rest_client @@ -57,7 +58,8 @@ class ServersClient(base_compute_client.BaseComputeClient): {'min': '2.54', 'max': '2.56', 'schema': schemav254}, {'min': '2.57', 'max': '2.62', 'schema': schemav257}, {'min': '2.63', 'max': '2.69', 'schema': schemav263}, - {'min': '2.70', 'max': None, 'schema': schemav270}] + {'min': '2.70', 'max': '2.70', 'schema': schemav270}, + {'min': '2.71', 'max': None, 'schema': schemav271}] def __init__(self, auth_provider, service, region, enable_instance_password=True, **kwargs):