0414bab3d3
Add return-request-id-to-caller function to resources and resource managers in the following files. The methods in the resource class and resource manager return a wrapper class that has 'request_ids' property. The caller can get request ids of the callee via the property. * novaclient/v2/keypairs.py * novaclient/v2/limits.py * novaclient/v2/networks.py * novaclient/v2/quota_classes.py * novaclient/v2/quotas.py * novaclient/v2/security_group_default_rules.py * novaclient/v2/security_group_rules.py * novaclient/v2/security_groups.py * novaclient/v2/server_groups.py * novaclient/v2/services.py * novaclient/v2/usage.py * novaclient/v2/versions.py Co-authored-by: Ankit Agrawal <ankit11.agrawal@nttdata.com> Change-Id: I9203f70a0eef5686b590fbff35563f2cf8b6f586 Implements: blueprint return-request-id-to-caller
135 lines
5.6 KiB
Python
135 lines
5.6 KiB
Python
# Copyright 2012 IBM Corp.
|
|
# 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 novaclient import api_versions
|
|
from novaclient.tests.unit import utils
|
|
from novaclient.tests.unit.v2 import fakes
|
|
from novaclient.v2 import services
|
|
|
|
|
|
class ServicesTest(utils.TestCase):
|
|
def setUp(self):
|
|
super(ServicesTest, self).setUp()
|
|
self.cs = self._get_fake_client()
|
|
self.service_type = self._get_service_type()
|
|
|
|
def _get_fake_client(self):
|
|
return fakes.FakeClient()
|
|
|
|
def _get_service_type(self):
|
|
return services.Service
|
|
|
|
def test_list_services(self):
|
|
svs = self.cs.services.list()
|
|
self.assert_request_id(svs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.cs.assert_called('GET', '/os-services')
|
|
for s in svs:
|
|
self.assertIsInstance(s, self._get_service_type())
|
|
self.assertEqual('nova-compute', s.binary)
|
|
self.assertEqual('host1', s.host)
|
|
self.assertTrue(str(s).startswith('<Service: '))
|
|
|
|
def test_list_services_with_hostname(self):
|
|
svs = self.cs.services.list(host='host2')
|
|
self.assert_request_id(svs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.cs.assert_called('GET', '/os-services?host=host2')
|
|
for s in svs:
|
|
self.assertIsInstance(s, self._get_service_type())
|
|
self.assertEqual('nova-compute', s.binary)
|
|
self.assertEqual('host2', s.host)
|
|
|
|
def test_list_services_with_binary(self):
|
|
svs = self.cs.services.list(binary='nova-cert')
|
|
self.assert_request_id(svs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.cs.assert_called('GET', '/os-services?binary=nova-cert')
|
|
for s in svs:
|
|
self.assertIsInstance(s, self._get_service_type())
|
|
self.assertEqual('nova-cert', s.binary)
|
|
self.assertEqual('host1', s.host)
|
|
|
|
def test_list_services_with_host_binary(self):
|
|
svs = self.cs.services.list(host='host2', binary='nova-cert')
|
|
self.assert_request_id(svs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.cs.assert_called('GET',
|
|
'/os-services?host=host2&binary=nova-cert')
|
|
for s in svs:
|
|
self.assertIsInstance(s, self._get_service_type())
|
|
self.assertEqual('nova-cert', s.binary)
|
|
self.assertEqual('host2', s.host)
|
|
|
|
def _update_body(self, host, binary, disabled_reason=None):
|
|
body = {"host": host,
|
|
"binary": binary}
|
|
if disabled_reason is not None:
|
|
body["disabled_reason"] = disabled_reason
|
|
return body
|
|
|
|
def test_services_enable(self):
|
|
service = self.cs.services.enable('host1', 'nova-cert')
|
|
self.assert_request_id(service, fakes.FAKE_REQUEST_ID_LIST)
|
|
values = self._update_body("host1", "nova-cert")
|
|
self.cs.assert_called('PUT', '/os-services/enable', values)
|
|
self.assertIsInstance(service, self._get_service_type())
|
|
self.assertEqual('enabled', service.status)
|
|
|
|
def test_services_delete(self):
|
|
ret = self.cs.services.delete('1')
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.cs.assert_called('DELETE', '/os-services/1')
|
|
|
|
def test_services_disable(self):
|
|
service = self.cs.services.disable('host1', 'nova-cert')
|
|
self.assert_request_id(service, fakes.FAKE_REQUEST_ID_LIST)
|
|
values = self._update_body("host1", "nova-cert")
|
|
self.cs.assert_called('PUT', '/os-services/disable', values)
|
|
self.assertIsInstance(service, self._get_service_type())
|
|
self.assertEqual('disabled', service.status)
|
|
|
|
def test_services_disable_log_reason(self):
|
|
service = self.cs.services.disable_log_reason(
|
|
'compute1', 'nova-compute', 'disable bad host')
|
|
self.assert_request_id(service, fakes.FAKE_REQUEST_ID_LIST)
|
|
values = self._update_body("compute1", "nova-compute",
|
|
"disable bad host")
|
|
self.cs.assert_called('PUT', '/os-services/disable-log-reason', values)
|
|
self.assertIsInstance(service, self._get_service_type())
|
|
self.assertEqual('disabled', service.status)
|
|
|
|
|
|
class ServicesV211TestCase(ServicesTest):
|
|
def setUp(self):
|
|
super(ServicesV211TestCase, self).setUp()
|
|
self.cs.api_version = api_versions.APIVersion("2.11")
|
|
|
|
def _update_body(self, host, binary, disabled_reason=None,
|
|
force_down=None):
|
|
body = {"host": host,
|
|
"binary": binary}
|
|
if disabled_reason is not None:
|
|
body["disabled_reason"] = disabled_reason
|
|
if force_down is not None:
|
|
body["forced_down"] = force_down
|
|
return body
|
|
|
|
def test_services_force_down(self):
|
|
service = self.cs.services.force_down(
|
|
'compute1', 'nova-compute', False)
|
|
self.assert_request_id(service, fakes.FAKE_REQUEST_ID_LIST)
|
|
values = self._update_body("compute1", "nova-compute",
|
|
force_down=False)
|
|
self.cs.assert_called('PUT', '/os-services/force-down', values)
|
|
self.assertIsInstance(service, self._get_service_type())
|
|
self.assertFalse(service.forced_down)
|