openstack
/
tempest
Code Issues Proposed changes

Merge "Add response schema validation for volume transfer"

This commit is contained in:
Zuul 2019-09-09 05:15:23 +00:00 committed by Gerrit Code Review
parent 8d1b36559c 48a76dbcc7
commit fa4796b999
3 changed files with 137 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/volume/test_volume_transfers.py
View File

@ -63,8 +63,6 @@ class VolumesTransfersTest(base.BaseVolumeTest):
# Accept a volume transfer by alt_tenant
body = self.alt_client.accept_volume_transfer(
transfer_id, auth_key=auth_key)['transfer']
for key in ['id', 'name', 'links', 'volume_id']:
self.assertIn(key, body)
waiters.wait_for_volume_resource_status(self.alt_volumes_client,
volume['id'], 'available')
accepted_volume = self.alt_volumes_client.show_volume(
@ -95,8 +93,6 @@ class VolumesTransfersTest(base.BaseVolumeTest):
# elements, and look for the created transfer.
transfers = self.client.list_volume_transfers(detail=True)['transfers']
self.assertNotEmpty(transfers)
for transfer in transfers:
self.assertIn('created_at', transfer)
volume_list = [transfer['volume_id'] for transfer in transfers]
self.assertIn(volume['id'], volume_list,
'Transfer not found for volume %s' % volume['id'])

129
tempest/lib/api_schema/response/volume/transfers.py Normal file
View File

@ -0,0 +1,129 @@
# Copyright 2015 NEC Corporation. All rights reserved.
#
# 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.
from tempest.lib.api_schema.response.compute.v2_1 import parameter_types
create_volume_transfer = {
'status_code': [202],
'response_body': {
'type': 'object',
'properties': {
'transfer': {
'type': 'object',
'properties': {
'auth_key': {'type': 'string'},
'links': parameter_types.links,
'created_at': parameter_types.date_time,
'volume_id': {'type': 'string', 'format': 'uuid'},
'id': {'type': 'string', 'format': 'uuid'},
'name': {'type': ['string', 'null']}
},
'additionalProperties': False,
'required': ['auth_key', 'links', 'created_at',
'volume_id', 'id', 'name']
}
},
'additionalProperties': False,
'required': ['transfer']
}
}
common_show_volume_transfer = {
'type': 'object',
'properties': {
'links': parameter_types.links,
'created_at': parameter_types.date_time,
'volume_id': {'type': 'string', 'format': 'uuid'},
'id': {'type': 'string', 'format': 'uuid'},
'name': {'type': ['string', 'null']}
},
'additionalProperties': False,
'required': ['links', 'created_at', 'volume_id', 'id', 'name']
}
show_volume_transfer = {
'status_code': [200],
'response_body': {
'type': 'object',
'properties': {
'transfer': common_show_volume_transfer
},
'additionalProperties': False,
'required': ['transfer']
}
}
list_volume_transfers_no_detail = {
'status_code': [200],
'response_body': {
'type': 'object',
'properties': {
'transfers': {
'type': 'array',
'items': {
'type': 'object',
'properties': {
'volume_id': {'type': 'string', 'format': 'uuid'},
'id': {'type': 'string', 'format': 'uuid'},
'links': parameter_types.links,
'name': {'type': ['string', 'null']}
},
'additionalProperties': False,
'required': ['volume_id', 'id', 'links', 'name']
}
}
},
'additionalProperties': False,
'required': ['transfers'],
}
}
list_volume_transfers_with_detail = {
'status_code': [200],
'response_body': {
'type': 'object',
'properties': {
'transfers': {
'type': 'array',
'items': common_show_volume_transfer
}
},
'additionalProperties': False,
'required': ['transfers'],
}
}
delete_volume_transfer = {'status_code': [202]}
accept_volume_transfer = {
'status_code': [202],
'response_body': {
'type': 'object',
'properties': {
'transfer': {
'type': 'object',
'properties': {
'links': parameter_types.links,
'volume_id': {'type': 'string', 'format': 'uuid'},
'id': {'type': 'string', 'format': 'uuid'},
'name': {'type': ['string', 'null']}
},
'additionalProperties': False,
'required': ['links', 'volume_id', 'id', 'name']
}
},
'additionalProperties': False,
'required': ['transfer']
}
}

13
tempest/lib/services/volume/v3/transfers_client.py
View File

@ -16,6 +16,7 @@
from oslo_serialization import jsonutils as json
from six.moves.urllib import parse as urllib
from tempest.lib.api_schema.response.volume import transfers as schema
from tempest.lib.common import rest_client
@ -32,7 +33,7 @@ class TransfersClient(rest_client.RestClient):
post_body = json.dumps({'transfer': kwargs})
resp, body = self.post('os-volume-transfer', post_body)
body = json.loads(body)
self.expected_success(202, resp.status)
self.validate_response(schema.create_volume_transfer, resp, body)
return rest_client.ResponseBody(resp, body)
def show_volume_transfer(self, transfer_id):
@ -40,7 +41,7 @@ class TransfersClient(rest_client.RestClient):
url = "os-volume-transfer/%s" % transfer_id
resp, body = self.get(url)
body = json.loads(body)
self.expected_success(200, resp.status)
self.validate_response(schema.show_volume_transfer, resp, body)
return rest_client.ResponseBody(resp, body)
def list_volume_transfers(self, detail=False, **params):
@ -52,19 +53,21 @@ class TransfersClient(rest_client.RestClient):
https://docs.openstack.org/api-ref/block-storage/v3/index.html#list-volume-transfers-and-details
"""
url = 'os-volume-transfer'
schema_list_transfers = schema.list_volume_transfers_no_detail
if detail:
url += '/detail'
schema_list_transfers = schema.list_volume_transfers_with_detail
if params:
url += '?%s' % urllib.urlencode(params)
resp, body = self.get(url)
body = json.loads(body)
self.expected_success(200, resp.status)
self.validate_response(schema_list_transfers, resp, body)
return rest_client.ResponseBody(resp, body)
def delete_volume_transfer(self, transfer_id):
"""Delete a volume transfer."""
resp, body = self.delete("os-volume-transfer/%s" % transfer_id)
self.expected_success(202, resp.status)
self.validate_response(schema.delete_volume_transfer, resp, body)
return rest_client.ResponseBody(resp, body)
def accept_volume_transfer(self, transfer_id, **kwargs):
@ -78,5 +81,5 @@ class TransfersClient(rest_client.RestClient):
post_body = json.dumps({'accept': kwargs})
resp, body = self.post(url, post_body)
body = json.loads(body)
self.expected_success(202, resp.status)
self.validate_response(schema.accept_volume_transfer, resp, body)
return rest_client.ResponseBody(resp, body)