openstack
/
osprofiler
Code Issues Proposed changes

Merge "Improve error reporting for Ceilometer driver"

This commit is contained in:
Jenkins 2017-06-30 10:12:37 +00:00 committed by Gerrit Code Review
parent cffca4e29e 2e4a066042
commit 343fe299bf
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osprofiler/drivers/ceilometer.py
View File

@ -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

7
osprofiler/tests/unit/cmd/test_shell.py
View File

@ -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")