From e9ed6092ec763a4c674cf55b71e43c97eb330d3f Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 16 Jun 2020 16:36:59 +0800 Subject: [PATCH] Add delete_on_termination for compute API v2.79 - os-volume_attachments This adds delete_on_termination field for the compute API response schema for the 2.79 microversion in the following APIs: - GET /servers/{server_id}/os-volume_attachments (list) - GET /servers/{server_id}/os-volume_attachments/{volume_id} (show) - POST /servers/{server_id}/os-volume_attachments (attach) Change-Id: I7a9b22477b800c6d60acb67c27aff5dcb61d7875 --- doc/source/microversion_testing.rst | 4 ++ .../response/compute/v2_79/__init__.py | 0 .../response/compute/v2_79/servers.py | 67 +++++++++++++++++++ .../lib/services/compute/servers_client.py | 4 +- 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tempest/lib/api_schema/response/compute/v2_79/__init__.py create mode 100644 tempest/lib/api_schema/response/compute/v2_79/servers.py diff --git a/doc/source/microversion_testing.rst b/doc/source/microversion_testing.rst index 06062c26b6..f37342ea14 100644 --- a/doc/source/microversion_testing.rst +++ b/doc/source/microversion_testing.rst @@ -426,6 +426,10 @@ Microversion tests implemented in Tempest .. _2.73: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#id66 + * `2.79`_ + + .. _2.79: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#maximum-in-train + * Volume * `3.3`_ diff --git a/tempest/lib/api_schema/response/compute/v2_79/__init__.py b/tempest/lib/api_schema/response/compute/v2_79/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tempest/lib/api_schema/response/compute/v2_79/servers.py b/tempest/lib/api_schema/response/compute/v2_79/servers.py new file mode 100644 index 0000000000..58dcba8798 --- /dev/null +++ b/tempest/lib/api_schema/response/compute/v2_79/servers.py @@ -0,0 +1,67 @@ +# 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_73 import servers as servers273 + + +########################################################################### +# +# 2.79: +# +# The delete_on_termination parameter is now returned in the response body +# of the following calls: +# +# - GET /servers/{server_id}/os-volume_attachments +# - GET /servers/{server_id}/os-volume_attachments/{volume_id} +# - POST /servers/{server_id}/os-volume_attachments +########################################################################### + +attach_volume = copy.deepcopy(servers273.attach_volume) +attach_volume['response_body']['properties']['volumeAttachment'][ + 'properties'].update({'delete_on_termination': {'type': 'boolean'}}) +attach_volume['response_body']['properties']['volumeAttachment'][ + 'required'].append('delete_on_termination') + +show_volume_attachment = copy.deepcopy(servers273.show_volume_attachment) +show_volume_attachment['response_body']['properties']['volumeAttachment'][ + 'properties'].update({'delete_on_termination': {'type': 'boolean'}}) +show_volume_attachment['response_body']['properties'][ + 'volumeAttachment']['required'].append('delete_on_termination') + +list_volume_attachments = copy.deepcopy(servers273.list_volume_attachments) +list_volume_attachments['response_body']['properties']['volumeAttachments'][ + 'items']['properties'].update( + {'delete_on_termination': {'type': 'boolean'}}) +list_volume_attachments['response_body']['properties'][ + 'volumeAttachments']['items']['required'].append('delete_on_termination') + +# NOTE(zhufl): 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.73 *** +rebuild_server = copy.deepcopy(servers273.rebuild_server) +rebuild_server_with_admin_pass = copy.deepcopy( + servers273.rebuild_server_with_admin_pass) +update_server = copy.deepcopy(servers273.update_server) +get_server = copy.deepcopy(servers273.get_server) +list_servers_detail = copy.deepcopy(servers273.list_servers_detail) +list_servers = copy.deepcopy(servers273.list_servers) +show_server_diagnostics = copy.deepcopy(servers273.show_server_diagnostics) +get_remote_consoles = copy.deepcopy(servers273.get_remote_consoles) +list_tags = copy.deepcopy(servers273.list_tags) +update_all_tags = copy.deepcopy(servers273.update_all_tags) +delete_all_tags = copy.deepcopy(servers273.delete_all_tags) +check_tag_existence = copy.deepcopy(servers273.check_tag_existence) +update_tag = copy.deepcopy(servers273.update_tag) +delete_tag = copy.deepcopy(servers273.delete_tag) diff --git a/tempest/lib/services/compute/servers_client.py b/tempest/lib/services/compute/servers_client.py index c36f80ab19..e58890c89c 100644 --- a/tempest/lib/services/compute/servers_client.py +++ b/tempest/lib/services/compute/servers_client.py @@ -36,6 +36,7 @@ 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_73 import servers as schemav273 +from tempest.lib.api_schema.response.compute.v2_79 import servers as schemav279 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 @@ -61,7 +62,8 @@ class ServersClient(base_compute_client.BaseComputeClient): {'min': '2.63', 'max': '2.69', 'schema': schemav263}, {'min': '2.70', 'max': '2.70', 'schema': schemav270}, {'min': '2.71', 'max': '2.72', 'schema': schemav271}, - {'min': '2.73', 'max': None, 'schema': schemav273}] + {'min': '2.73', 'max': '2.78', 'schema': schemav273}, + {'min': '2.79', 'max': None, 'schema': schemav279}] def __init__(self, auth_provider, service, region, enable_instance_password=True, **kwargs):