Improve error reporting for Ceilometer driver
Currently we print a generic message if something goes wrong with ceilometer client initialization. Adding the exception message to improve the error message printed. Change-Id: I1b0dbb3951875597bfe3d8ef36626cd798e62e09
This commit is contained in:
parent
1a86e4fbb4
commit
2e4a066042
|
@ -36,8 +36,7 @@ class Ceilometer(base.Driver):
|
||||||
if hasattr(e, "http_status") and e.http_status == 401:
|
if hasattr(e, "http_status") and e.http_status == 401:
|
||||||
msg = "Invalid OpenStack Identity credentials."
|
msg = "Invalid OpenStack Identity credentials."
|
||||||
else:
|
else:
|
||||||
msg = ("Something has gone wrong. See ceilometer logs "
|
msg = "Error occurred while connecting to Ceilometer: %s." % e
|
||||||
"for more details")
|
|
||||||
raise exc.CommandError(msg)
|
raise exc.CommandError(msg)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
|
@ -145,11 +145,8 @@ class ShellTestCase(test.TestCase):
|
||||||
self._test_with_command_error(self._trace_show_cmd(), msg)
|
self._test_with_command_error(self._trace_show_cmd(), msg)
|
||||||
|
|
||||||
def test_trace_show_unknown_error(self):
|
def test_trace_show_unknown_error(self):
|
||||||
class FakeException(Exception):
|
self.ceiloclient.client.get_client.side_effect = Exception("test")
|
||||||
pass
|
msg = "Error occurred while connecting to Ceilometer: test."
|
||||||
|
|
||||||
self.ceiloclient.client.get_client.side_effect = FakeException
|
|
||||||
msg = "Something has gone wrong. See ceilometer logs for more details"
|
|
||||||
self._test_with_command_error(self._trace_show_cmd(), msg)
|
self._test_with_command_error(self._trace_show_cmd(), msg)
|
||||||
|
|
||||||
@mock.patch("osprofiler.drivers.ceilometer.Ceilometer.get_report")
|
@mock.patch("osprofiler.drivers.ceilometer.Ceilometer.get_report")
|
||||||
|
|
Loading…
Reference in New Issue