From 2e4a06604297d5b0164c52101bdde17581d361f1 Mon Sep 17 00:00:00 2001 From: Vipin Balachandran Date: Tue, 23 May 2017 18:26:13 -0700 Subject: [PATCH] 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 --- osprofiler/drivers/ceilometer.py | 3 +-- osprofiler/tests/unit/cmd/test_shell.py | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/osprofiler/drivers/ceilometer.py b/osprofiler/drivers/ceilometer.py index 746934f..fb6bd95 100644 --- a/osprofiler/drivers/ceilometer.py +++ b/osprofiler/drivers/ceilometer.py @@ -36,8 +36,7 @@ class Ceilometer(base.Driver): if hasattr(e, "http_status") and e.http_status == 401: msg = "Invalid OpenStack Identity credentials." else: - msg = ("Something has gone wrong. See ceilometer logs " - "for more details") + msg = "Error occurred while connecting to Ceilometer: %s." % e raise exc.CommandError(msg) @classmethod diff --git a/osprofiler/tests/unit/cmd/test_shell.py b/osprofiler/tests/unit/cmd/test_shell.py index 1121c24..20293ea 100644 --- a/osprofiler/tests/unit/cmd/test_shell.py +++ b/osprofiler/tests/unit/cmd/test_shell.py @@ -145,11 +145,8 @@ class ShellTestCase(test.TestCase): self._test_with_command_error(self._trace_show_cmd(), msg) def test_trace_show_unknown_error(self): - class FakeException(Exception): - pass - - self.ceiloclient.client.get_client.side_effect = FakeException - msg = "Something has gone wrong. See ceilometer logs for more details" + self.ceiloclient.client.get_client.side_effect = Exception("test") + msg = "Error occurred while connecting to Ceilometer: test." self._test_with_command_error(self._trace_show_cmd(), msg) @mock.patch("osprofiler.drivers.ceilometer.Ceilometer.get_report")