047cb68493
Use file logger for all command specific logs. This patch also fixes some usage that doesn't follow rules in: http://docs.openstack.org/developer/oslo.i18n/guidelines.html After this patch, all self.log and self.app.log will be standardized to LOG(). NOTE: In shell.py, we got the log in class OpenStackShell, which is also known as self.app.log in other classes. This logger is used to record non-command-specific logs. So we leave it as-is. Change-Id: I114f73ee6c7e84593d71e724bc1ad00d343c1896 Implements: blueprint log-usage
339 lines
11 KiB
Python
339 lines
11 KiB
Python
# Copyright 2015 Mirantis, Inc.
|
|
#
|
|
# 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.
|
|
#
|
|
|
|
import mock
|
|
|
|
from osc_lib import exceptions
|
|
|
|
from openstackclient.compute.v2 import service
|
|
from openstackclient.tests.compute.v2 import fakes as compute_fakes
|
|
|
|
|
|
class TestService(compute_fakes.TestComputev2):
|
|
|
|
def setUp(self):
|
|
super(TestService, self).setUp()
|
|
|
|
# Get a shortcut to the ServiceManager Mock
|
|
self.service_mock = self.app.client_manager.compute.services
|
|
self.service_mock.reset_mock()
|
|
|
|
|
|
class TestServiceDelete(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceDelete, self).setUp()
|
|
|
|
self.service = compute_fakes.FakeService.create_one_service()
|
|
|
|
self.service_mock.delete.return_value = None
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.DeleteService(self.app, None)
|
|
|
|
def test_service_delete_no_options(self):
|
|
arglist = [
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.delete.assert_called_with(
|
|
self.service.binary,
|
|
)
|
|
self.assertIsNone(result)
|
|
|
|
|
|
class TestServiceList(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceList, self).setUp()
|
|
|
|
self.service = compute_fakes.FakeService.create_one_service()
|
|
|
|
self.service_mock.list.return_value = [self.service]
|
|
|
|
# Get the command object to test
|
|
self.cmd = service.ListService(self.app, None)
|
|
|
|
def test_service_list(self):
|
|
arglist = [
|
|
'--host', self.service.host,
|
|
'--service', self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.list.assert_called_with(
|
|
self.service.host,
|
|
self.service.binary,
|
|
)
|
|
|
|
self.assertNotIn("Disabled Reason", columns)
|
|
self.assertNotIn(self.service.disabled_reason, list(data)[0])
|
|
|
|
def test_service_list_with_long_option(self):
|
|
arglist = [
|
|
'--host', self.service.host,
|
|
'--service', self.service.binary,
|
|
'--long'
|
|
]
|
|
verifylist = [
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
('long', True)
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.assertIn("Disabled Reason", columns)
|
|
self.assertIn(self.service.disabled_reason, list(data)[0])
|
|
|
|
|
|
class TestServiceSet(TestService):
|
|
|
|
def setUp(self):
|
|
super(TestServiceSet, self).setUp()
|
|
|
|
self.service = compute_fakes.FakeService.create_one_service()
|
|
|
|
self.service_mock.enable.return_value = self.service
|
|
self.service_mock.disable.return_value = self.service
|
|
|
|
self.cmd = service.SetService(self.app, None)
|
|
|
|
def test_set_nothing(self):
|
|
arglist = [
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.enable.assert_not_called()
|
|
self.service_mock.disable.assert_not_called()
|
|
self.service_mock.disable_log_reason.assert_not_called()
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_enable(self):
|
|
arglist = [
|
|
'--enable',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.enable.assert_called_with(
|
|
self.service.host,
|
|
self.service.binary
|
|
)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_disable(self):
|
|
arglist = [
|
|
'--disable',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('disable', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.disable.assert_called_with(
|
|
self.service.host,
|
|
self.service.binary
|
|
)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_disable_with_reason(self):
|
|
reason = 'earthquake'
|
|
arglist = [
|
|
'--disable',
|
|
'--disable-reason', reason,
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('disable', True),
|
|
('disable_reason', reason),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.service_mock.disable_log_reason.assert_called_with(
|
|
self.service.host,
|
|
self.service.binary,
|
|
reason
|
|
)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_only_with_disable_reason(self):
|
|
reason = 'earthquake'
|
|
arglist = [
|
|
'--disable-reason', reason,
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('disable_reason', reason),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
try:
|
|
self.cmd.take_action(parsed_args)
|
|
self.fail("CommandError should be raised.")
|
|
except exceptions.CommandError as e:
|
|
self.assertEqual("Cannot specify option --disable-reason without "
|
|
"--disable specified.", str(e))
|
|
|
|
def test_service_set_enable_with_disable_reason(self):
|
|
reason = 'earthquake'
|
|
arglist = [
|
|
'--enable',
|
|
'--disable-reason', reason,
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('disable_reason', reason),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
try:
|
|
self.cmd.take_action(parsed_args)
|
|
self.fail("CommandError should be raised.")
|
|
except exceptions.CommandError as e:
|
|
self.assertEqual("Cannot specify option --disable-reason without "
|
|
"--disable specified.", str(e))
|
|
|
|
def test_service_set_state_up(self):
|
|
arglist = [
|
|
'--up',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('up', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
result = self.cmd.take_action(parsed_args)
|
|
self.service_mock.force_down.assert_called_once_with(
|
|
self.service.host, self.service.binary, force_down=False)
|
|
self.assertNotCalled(self.service_mock.enable)
|
|
self.assertNotCalled(self.service_mock.disable)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_state_down(self):
|
|
arglist = [
|
|
'--down',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('down', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
result = self.cmd.take_action(parsed_args)
|
|
self.service_mock.force_down.assert_called_once_with(
|
|
self.service.host, self.service.binary, force_down=True)
|
|
self.assertNotCalled(self.service_mock.enable)
|
|
self.assertNotCalled(self.service_mock.disable)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_enable_and_state_down(self):
|
|
arglist = [
|
|
'--enable',
|
|
'--down',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('down', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
result = self.cmd.take_action(parsed_args)
|
|
self.service_mock.enable.assert_called_once_with(
|
|
self.service.host, self.service.binary)
|
|
self.service_mock.force_down.assert_called_once_with(
|
|
self.service.host, self.service.binary, force_down=True)
|
|
self.assertIsNone(result)
|
|
|
|
def test_service_set_enable_and_state_down_with_exception(self):
|
|
arglist = [
|
|
'--enable',
|
|
'--down',
|
|
self.service.host,
|
|
self.service.binary,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('down', True),
|
|
('host', self.service.host),
|
|
('service', self.service.binary),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
with mock.patch.object(self.service_mock, 'enable',
|
|
side_effect=Exception()):
|
|
self.assertRaises(exceptions.CommandError,
|
|
self.cmd.take_action, parsed_args)
|
|
self.service_mock.force_down.assert_called_once_with(
|
|
self.service.host, self.service.binary, force_down=True)
|