openstack
/
tempest
Code Issues Proposed changes

Merge "Add new schema for Nova microversion 2.63"

This commit is contained in:
Zuul 2018-06-18 08:05:30 +00:00 committed by Gerrit Code Review
parent db7f2a07ec 1fa4464404
commit d09caf65b8
5 changed files with 104 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/microversion_testing.rst
View File

@ -372,7 +372,11 @@ Microversion tests implemented in Tempest
* `2.60`_
.. _2.60: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#id54
.. _2.60: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#maximum-in-queens
* `2.63`_
.. _2.63: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#id57
* Volume

31
tempest/api/compute/servers/test_servers.py
View File

@ -209,3 +209,34 @@ class ServerShowV247Test(base.BaseV2ComputeTest):
server['id'], 'ACTIVE')
# Checking list details API response schema
self.servers_client.list_servers(detail=True)
class ServerShowV263Test(base.BaseV2ComputeTest):
min_microversion = '2.63'
max_microversion = 'latest'
@decorators.idempotent_id('71b8e3d5-11d2-494f-b917-b094a4afed3c')
def test_show_update_rebuild_list_server(self):
trusted_certs = ['test-cert-1', 'test-cert-2']
server = self.create_test_server(
trusted_image_certificates=trusted_certs,
wait_until='ACTIVE')
# Check show API response schema
self.servers_client.show_server(server['id'])['server']
# Check update API response schema
self.servers_client.update_server(server['id'])
waiters.wait_for_server_status(self.servers_client,
server['id'], 'ACTIVE')
# Check rebuild API response schema
self.servers_client.rebuild_server(server['id'], self.image_ref_alt)
waiters.wait_for_server_status(self.servers_client,
server['id'], 'ACTIVE')
# Check list details API response schema
params = {'trusted_image_certificates': trusted_certs}
servers = self.servers_client.list_servers(
detail=True, **params)['servers']
self.assertNotEmpty(servers)

0
tempest/lib/api_schema/response/compute/v2_63/__init__.py Normal file
View File

65
tempest/lib/api_schema/response/compute/v2_63/servers.py Normal file
View File

@ -0,0 +1,65 @@
# 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_26 import servers as servers226
from tempest.lib.api_schema.response.compute.v2_54 import servers as servers254
from tempest.lib.api_schema.response.compute.v2_57 import servers as servers257
# Nova microversion 2.63 adds 'trusted_image_certificates' (a list of
# certificate IDs) to the server rebuild and servers details responses.
trusted_certs = {
'type': ['array', 'null'],
'minItems': 1,
'maxItems': 50,
'uniqueItems': True,
'items': {
'type': 'string',
'minLength': 1
}
}
# list response schema wasn't changed for v2.63 so use v2.26
list_servers = copy.deepcopy(servers226.list_servers)
list_servers_detail = copy.deepcopy(servers254.list_servers_detail)
list_servers_detail['response_body']['properties']['servers']['items'][
'properties'].update({'trusted_image_certificates': trusted_certs})
list_servers_detail['response_body']['properties']['servers']['items'][
'required'].append('trusted_image_certificates')
rebuild_server = copy.deepcopy(servers257.rebuild_server)
rebuild_server['response_body']['properties']['server'][
'properties'].update({'trusted_image_certificates': trusted_certs})
rebuild_server['response_body']['properties']['server'][
'required'].append('trusted_image_certificates')
rebuild_server_with_admin_pass = copy.deepcopy(
servers257.rebuild_server_with_admin_pass)
rebuild_server_with_admin_pass['response_body']['properties']['server'][
'properties'].update({'trusted_image_certificates': trusted_certs})
rebuild_server_with_admin_pass['response_body']['properties']['server'][
'required'].append('trusted_image_certificates')
update_server = copy.deepcopy(servers254.update_server)
update_server['response_body']['properties']['server'][
'properties'].update({'trusted_image_certificates': trusted_certs})
update_server['response_body']['properties']['server'][
'required'].append('trusted_image_certificates')
get_server = copy.deepcopy(servers254.get_server)
get_server['response_body']['properties']['server'][
'properties'].update({'trusted_image_certificates': trusted_certs})
get_server['response_body']['properties']['server'][
'required'].append('trusted_image_certificates')

4
tempest/lib/services/compute/servers_client.py
View File

@ -32,6 +32,7 @@ from tempest.lib.api_schema.response.compute.v2_48 import servers as schemav248
from tempest.lib.api_schema.response.compute.v2_54 import servers as schemav254
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_9 import servers as schemav29
from tempest.lib.common import rest_client
from tempest.lib.services.compute import base_compute_client
@ -51,7 +52,8 @@ class ServersClient(base_compute_client.BaseComputeClient):
{'min': '2.47', 'max': '2.47', 'schema': schemav247},
{'min': '2.48', 'max': '2.53', 'schema': schemav248},
{'min': '2.54', 'max': '2.56', 'schema': schemav254},
{'min': '2.57', 'max': None, 'schema': schemav257}]
{'min': '2.57', 'max': '2.62', 'schema': schemav257},
{'min': '2.63', 'max': None, 'schema': schemav263}]
def __init__(self, auth_provider, service, region,
enable_instance_password=True, **kwargs):