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
83 lines
3.4 KiB
Python
83 lines
3.4 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# 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
|
|
from cinderclient.v2 import services
|
|
|
|
|
|
cs = fakes.FakeClient()
|
|
|
|
|
|
class ServicesTest(utils.TestCase):
|
|
|
|
def test_list_services(self):
|
|
svs = cs.services.list()
|
|
cs.assert_called('GET', '/os-services')
|
|
self.assertEqual(3, len(svs))
|
|
[self.assertIsInstance(s, services.Service) for s in svs]
|
|
self._assert_request_id(svs)
|
|
|
|
def test_list_services_with_hostname(self):
|
|
svs = cs.services.list(host='host2')
|
|
cs.assert_called('GET', '/os-services?host=host2')
|
|
self.assertEqual(2, len(svs))
|
|
[self.assertIsInstance(s, services.Service) for s in svs]
|
|
[self.assertEqual('host2', s.host) for s in svs]
|
|
self._assert_request_id(svs)
|
|
|
|
def test_list_services_with_binary(self):
|
|
svs = cs.services.list(binary='cinder-volume')
|
|
cs.assert_called('GET', '/os-services?binary=cinder-volume')
|
|
self.assertEqual(2, len(svs))
|
|
[self.assertIsInstance(s, services.Service) for s in svs]
|
|
[self.assertEqual('cinder-volume', s.binary) for s in svs]
|
|
self._assert_request_id(svs)
|
|
|
|
def test_list_services_with_host_binary(self):
|
|
svs = cs.services.list('host2', 'cinder-volume')
|
|
cs.assert_called('GET', '/os-services?host=host2&binary=cinder-volume')
|
|
self.assertEqual(1, len(svs))
|
|
[self.assertIsInstance(s, services.Service) for s in svs]
|
|
[self.assertEqual('host2', s.host) for s in svs]
|
|
[self.assertEqual('cinder-volume', s.binary) for s in svs]
|
|
self._assert_request_id(svs)
|
|
|
|
def test_services_enable(self):
|
|
s = cs.services.enable('host1', 'cinder-volume')
|
|
values = {"host": "host1", 'binary': 'cinder-volume'}
|
|
cs.assert_called('PUT', '/os-services/enable', values)
|
|
self.assertIsInstance(s, services.Service)
|
|
self.assertEqual('enabled', s.status)
|
|
self._assert_request_id(s)
|
|
|
|
def test_services_disable(self):
|
|
s = cs.services.disable('host1', 'cinder-volume')
|
|
values = {"host": "host1", 'binary': 'cinder-volume'}
|
|
cs.assert_called('PUT', '/os-services/disable', values)
|
|
self.assertIsInstance(s, services.Service)
|
|
self.assertEqual('disabled', s.status)
|
|
self._assert_request_id(s)
|
|
|
|
def test_services_disable_log_reason(self):
|
|
s = cs.services.disable_log_reason(
|
|
'host1', 'cinder-volume', 'disable bad host')
|
|
values = {"host": "host1", 'binary': 'cinder-volume',
|
|
"disabled_reason": "disable bad host"}
|
|
cs.assert_called('PUT', '/os-services/disable-log-reason', values)
|
|
self.assertIsInstance(s, services.Service)
|
|
self.assertEqual('disabled', s.status)
|
|
self._assert_request_id(s)
|