From 598f8ebb8d56288cc1e72f85ebe18c2fd7af29db Mon Sep 17 00:00:00 2001 From: Vipin Balachandran Date: Wed, 22 Mar 2017 15:28:27 +0530 Subject: [PATCH] Fix error message for invalid trace Some of the reasons printed for invalid trace are specific to Ceilometer. Ceilometer driver already prints authentication failure message. Also, end-users shouldn't be concerned about configuring Ceilometer. Updating the error message so that it is generic enough for all backends. Change-Id: Id44cdacaf423852458ebef6fb4e5d142ee9ee8b4 --- osprofiler/cmd/commands.py | 9 ++------- osprofiler/tests/unit/cmd/test_shell.py | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/osprofiler/cmd/commands.py b/osprofiler/cmd/commands.py index ff2a179..6181a64 100644 --- a/osprofiler/cmd/commands.py +++ b/osprofiler/cmd/commands.py @@ -62,13 +62,8 @@ class TraceCommands(BaseCommand): trace = engine.get_report(args.trace) if not trace or not trace.get("children"): - msg = ("Trace with UUID %s not found. " - "There are 3 possible reasons: \n" - " 1) You are using not admin credentials\n" - " 2) You specified wrong trace id\n" - " 3) You specified wrong HMAC Key in original calling\n" - " 4) Ceilometer didn't enable profiler notification topic" - % args.trace) + msg = ("Trace with UUID %s not found. Please check the HMAC key " + "used in the command." % args.trace) raise exc.CommandError(msg) # NOTE(ayelistratov): Ceilometer translates datetime objects to diff --git a/osprofiler/tests/unit/cmd/test_shell.py b/osprofiler/tests/unit/cmd/test_shell.py index d4ffaaf..1121c24 100644 --- a/osprofiler/tests/unit/cmd/test_shell.py +++ b/osprofiler/tests/unit/cmd/test_shell.py @@ -165,12 +165,8 @@ class ShellTestCase(test.TestCase): def test_trace_show_trace_id_not_found(self, notifications, mock_get): mock_get.return_value = notifications - msg = ("Trace with UUID %s not found. There are 3 possible reasons: \n" - " 1) You are using not admin credentials\n" - " 2) You specified wrong trace id\n" - " 3) You specified wrong HMAC Key in original calling\n" - " 4) Ceilometer didn't enable profiler notification topic" - % self.TRACE_ID) + msg = ("Trace with UUID %s not found. Please check the HMAC key " + "used in the command." % self.TRACE_ID) self._test_with_command_error(self._trace_show_cmd(), msg)