
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
90 lines
3.3 KiB
Python
90 lines
3.3 KiB
Python
# Copyright (C) 2013 eBay Inc.
|
|
# 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 QoSSpecsTest(utils.TestCase):
|
|
|
|
def test_create(self):
|
|
specs = dict(k1='v1', k2='v2')
|
|
qos = cs.qos_specs.create('qos-name', specs)
|
|
cs.assert_called('POST', '/qos-specs')
|
|
self._assert_request_id(qos)
|
|
|
|
def test_get(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
qos = cs.qos_specs.get(qos_id)
|
|
cs.assert_called('GET', '/qos-specs/%s' % qos_id)
|
|
self._assert_request_id(qos)
|
|
|
|
def test_list(self):
|
|
lst = cs.qos_specs.list()
|
|
cs.assert_called('GET', '/qos-specs')
|
|
self._assert_request_id(lst)
|
|
|
|
def test_delete(self):
|
|
qos = cs.qos_specs.delete('1B6B6A04-A927-4AEB-810B-B7BAAD49F57C')
|
|
cs.assert_called('DELETE',
|
|
'/qos-specs/1B6B6A04-A927-4AEB-810B-B7BAAD49F57C?'
|
|
'force=False')
|
|
self._assert_request_id(qos)
|
|
|
|
def test_set_keys(self):
|
|
body = {'qos_specs': dict(k1='v1')}
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
qos = cs.qos_specs.set_keys(qos_id, body)
|
|
cs.assert_called('PUT', '/qos-specs/%s' % qos_id)
|
|
self._assert_request_id(qos)
|
|
|
|
def test_unset_keys(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
body = {'keys': ['k1']}
|
|
qos = cs.qos_specs.unset_keys(qos_id, body)
|
|
cs.assert_called('PUT', '/qos-specs/%s/delete_keys' % qos_id)
|
|
self._assert_request_id(qos)
|
|
|
|
def test_get_associations(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
qos = cs.qos_specs.get_associations(qos_id)
|
|
cs.assert_called('GET', '/qos-specs/%s/associations' % qos_id)
|
|
self._assert_request_id(qos)
|
|
|
|
def test_associate(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
type_id = '4230B13A-7A37-4E84-B777-EFBA6FCEE4FF'
|
|
qos = cs.qos_specs.associate(qos_id, type_id)
|
|
cs.assert_called('GET', '/qos-specs/%s/associate?vol_type_id=%s'
|
|
% (qos_id, type_id))
|
|
self._assert_request_id(qos)
|
|
|
|
def test_disassociate(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
type_id = '4230B13A-7A37-4E84-B777-EFBA6FCEE4FF'
|
|
qos = cs.qos_specs.disassociate(qos_id, type_id)
|
|
cs.assert_called('GET', '/qos-specs/%s/disassociate?vol_type_id=%s'
|
|
% (qos_id, type_id))
|
|
self._assert_request_id(qos)
|
|
|
|
def test_disassociate_all(self):
|
|
qos_id = '1B6B6A04-A927-4AEB-810B-B7BAAD49F57C'
|
|
qos = cs.qos_specs.disassociate_all(qos_id)
|
|
cs.assert_called('GET', '/qos-specs/%s/disassociate_all' % qos_id)
|
|
self._assert_request_id(qos)
|