ec65605ede
Added request_ids attribute to resource object for all the cgsnapshots, consistencygroups, qos_specs, quota_classes, quotas and services APIs by updating following APIs: cgsnapshots: delete, update consistencygroups: delete, update, create qos_specs: delete, associate, disassociate, disassociate_all quota_classes: update quotas: update services: enable, disable, disable_log_reason These changes are required to return 'request_id' from client to log request_id mappings of cross projects. For more details on how request_id will be returned to the caller, please refer to the approved blueprint [1] discussed with the cross-project team. [1] http://specs.openstack.org/openstack/openstack-specs/specs/return-request-id.html DocImpact 'request-ids' will be returned as an attribute with response object. User can access it using 'res.request_ids' where 'res' is a response object. Change-Id: I7b399512fcec9ecd31938656deb60e325bb76ad4 Partial-Implements: blueprint return-request-id-to-caller
175 lines
7.4 KiB
Python
175 lines
7.4 KiB
Python
# Copyright (C) 2012 - 2014 EMC 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 cinderclient.tests.unit import utils
|
|
from cinderclient.tests.unit.v2 import fakes
|
|
|
|
cs = fakes.FakeClient()
|
|
|
|
|
|
class ConsistencygroupsTest(utils.TestCase):
|
|
|
|
def test_delete_consistencygroup(self):
|
|
v = cs.consistencygroups.list()[0]
|
|
vol = v.delete(force='True')
|
|
self._assert_request_id(vol)
|
|
cs.assert_called('POST', '/consistencygroups/1234/delete')
|
|
vol = cs.consistencygroups.delete('1234', force=True)
|
|
self._assert_request_id(vol)
|
|
cs.assert_called('POST', '/consistencygroups/1234/delete')
|
|
vol = cs.consistencygroups.delete(v, force=True)
|
|
self._assert_request_id(vol)
|
|
cs.assert_called('POST', '/consistencygroups/1234/delete')
|
|
|
|
def test_create_consistencygroup(self):
|
|
vol = cs.consistencygroups.create('type1,type2', 'cg')
|
|
cs.assert_called('POST', '/consistencygroups')
|
|
self._assert_request_id(vol)
|
|
|
|
def test_create_consistencygroup_with_volume_types(self):
|
|
vol = cs.consistencygroups.create('type1,type2', 'cg')
|
|
expected = {'consistencygroup': {'status': 'creating',
|
|
'description': None,
|
|
'availability_zone': None,
|
|
'user_id': None,
|
|
'name': 'cg',
|
|
'volume_types': 'type1,type2',
|
|
'project_id': None}}
|
|
cs.assert_called('POST', '/consistencygroups', body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_update_consistencygroup_name(self):
|
|
v = cs.consistencygroups.list()[0]
|
|
expected = {'consistencygroup': {'name': 'cg2'}}
|
|
vol = v.update(name='cg2')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update('1234', name='cg2')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update(v, name='cg2')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_update_consistencygroup_description(self):
|
|
v = cs.consistencygroups.list()[0]
|
|
expected = {'consistencygroup': {'description': 'cg2 desc'}}
|
|
vol = v.update(description='cg2 desc')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update('1234', description='cg2 desc')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update(v, description='cg2 desc')
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_update_consistencygroup_add_volumes(self):
|
|
v = cs.consistencygroups.list()[0]
|
|
uuids = 'uuid1,uuid2'
|
|
expected = {'consistencygroup': {'add_volumes': uuids}}
|
|
vol = v.update(add_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update('1234', add_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update(v, add_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_update_consistencygroup_remove_volumes(self):
|
|
v = cs.consistencygroups.list()[0]
|
|
uuids = 'uuid3,uuid4'
|
|
expected = {'consistencygroup': {'remove_volumes': uuids}}
|
|
vol = v.update(remove_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update('1234', remove_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
vol = cs.consistencygroups.update(v, remove_volumes=uuids)
|
|
cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_update_consistencygroup_none(self):
|
|
self.assertIsNone(cs.consistencygroups.update('1234'))
|
|
|
|
def test_update_consistencygroup_no_props(self):
|
|
cs.consistencygroups.update('1234')
|
|
|
|
def test_create_consistencygroup_from_src_snap(self):
|
|
vol = cs.consistencygroups.create_from_src('5678', None, name='cg')
|
|
expected = {
|
|
'consistencygroup-from-src': {
|
|
'status': 'creating',
|
|
'description': None,
|
|
'user_id': None,
|
|
'name': 'cg',
|
|
'cgsnapshot_id': '5678',
|
|
'project_id': None,
|
|
'source_cgid': None
|
|
}
|
|
}
|
|
cs.assert_called('POST', '/consistencygroups/create_from_src',
|
|
body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_create_consistencygroup_from_src_cg(self):
|
|
vol = cs.consistencygroups.create_from_src(None, '5678', name='cg')
|
|
expected = {
|
|
'consistencygroup-from-src': {
|
|
'status': 'creating',
|
|
'description': None,
|
|
'user_id': None,
|
|
'name': 'cg',
|
|
'source_cgid': '5678',
|
|
'project_id': None,
|
|
'cgsnapshot_id': None
|
|
}
|
|
}
|
|
cs.assert_called('POST', '/consistencygroups/create_from_src',
|
|
body=expected)
|
|
self._assert_request_id(vol)
|
|
|
|
def test_list_consistencygroup(self):
|
|
lst = cs.consistencygroups.list()
|
|
cs.assert_called('GET', '/consistencygroups/detail')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_list_consistencygroup_detailed_false(self):
|
|
lst = cs.consistencygroups.list(detailed=False)
|
|
cs.assert_called('GET', '/consistencygroups')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_list_consistencygroup_with_search_opts(self):
|
|
lst = cs.consistencygroups.list(search_opts={'foo': 'bar'})
|
|
cs.assert_called('GET', '/consistencygroups/detail?foo=bar')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_list_consistencygroup_with_empty_search_opt(self):
|
|
lst = cs.consistencygroups.list(
|
|
search_opts={'foo': 'bar', 'abc': None}
|
|
)
|
|
cs.assert_called('GET', '/consistencygroups/detail?foo=bar')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_get_consistencygroup(self):
|
|
consistencygroup_id = '1234'
|
|
vol = cs.consistencygroups.get(consistencygroup_id)
|
|
cs.assert_called('GET', '/consistencygroups/%s' % consistencygroup_id)
|
|
self._assert_request_id(vol)
|