From 1d27254f44db6872eac569548e63cb9b4273f1d2 Mon Sep 17 00:00:00 2001
From: Alexander Maretskiy <amaretskiy@mirantis.com>
Date: Thu, 20 Oct 2016 12:12:38 +0300
Subject: [PATCH] [CLI] Fix mentions of deprecated command `rally verify
 compare'

Change-Id: Ia4eef80cb6a6dd73b7756eaf3d7a71c471b56756
---
 rally/cli/commands/verify.py            | 8 ++++----
 rally/ui/templates/ci/index_verify.html | 6 +++---
 tests/ci/README.rst                     | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rally/cli/commands/verify.py b/rally/cli/commands/verify.py
index babc86260a..4498f9cbbd 100644
--- a/rally/cli/commands/verify.py
+++ b/rally/cli/commands/verify.py
@@ -235,7 +235,7 @@ class VerifyCommands(object):
     @cliutils.suppress_warnings
     def results(self, uuids=None, output_file=None,
                 output_html=False, output_json=False, output_csv=False):
-        """Display results of a verification.
+        """Display results of verifications.
 
         :param verification: UUID of a verification
         :param output_file: Path to a file to save results
@@ -375,9 +375,9 @@ class VerifyCommands(object):
         self.show(verification, sort_by, True)
 
     def compare(self, *args, **kwargs):
-        """Deprecated."""
-        # NOTE(amaretskiy): this command is deprecated in favor of
-        #                   improved 'rally task results'
+        """Deprecated. Use `rally verify results' instead."""
+        # NOTE(amaretskiy): deprecated since 'rally task results' has been
+        #                   improved and does same job much better
         print("This command is deprecated. Use 'rally task results' instead.")
         return 1
 
diff --git a/rally/ui/templates/ci/index_verify.html b/rally/ui/templates/ci/index_verify.html
index 35bccac0f9..9e35613f9b 100644
--- a/rally/ui/templates/ci/index_verify.html
+++ b/rally/ui/templates/ci/index_verify.html
@@ -113,15 +113,15 @@
 {% if compare %}
     <span class="{{ compare.html.status }}">[{{ compare.html.status }}]</span>
     <a href="{{ compare.html.output_file }}">Compare two verifications and display results in HTML</a> [<a href="{{ compare.html.stdout_file }}">Output from CLI</a>]
-    <code>$ rally verify compare --uuid-1 &lt;uuid-1&gt; --uuid-2 &lt;uuid-2&gt; --html</code>
+    <code>$ rally verify results --uuid &lt;uuid-1&gt; &lt;uuid&gt; --html</code>
 
     <span class="{{ compare.json.status }}">[{{ compare.json.status }}]</span>
     <a href="{{ compare.json.output_file }}">Compare two verifications and display results in JSON</a> [<a href="{{ compare.json.stdout_file }}">Output from CLI</a>]
-    <code>$ rally verify compare --uuid-1 &lt;uuid-1&gt; --uuid-2 &lt;uuid-2&gt; --json</code>
+    <code>$ rally verify results --uuid &lt;uuid-1&gt; &lt;uuid-2&gt; --json</code>
 
     <span class="{{ compare.csv.status }}">[{{ compare.csv.status }}]</span>
     <a href="{{ compare.csv.output_file }}">Compare two verifications and display results in CSV</a> [<a href="{{ compare.csv.stdout_file }}">Output from CLI</a>]
-    <code>$ rally verify compare --uuid-1 &lt;uuid-1&gt; --uuid-2 &lt;uuid-2&gt; --csv</code>
+    <code>$ rally verify results --uuid &lt;uuid-1&gt; &lt;uuid-2&gt; --csv</code>
 {% endif %}
 
     <span class="{{ list.status }}">[{{ list.status }}]</span>
diff --git a/tests/ci/README.rst b/tests/ci/README.rst
index 326cd070ce..43cfbb29f8 100644
--- a/tests/ci/README.rst
+++ b/tests/ci/README.rst
@@ -18,7 +18,7 @@ This script runs a functional tests suite for Rally CLI. The tests call a range
 rally-verify.sh
 ---------------
 This script runs various "rally verify" commands. This set of commands allow us to perform Tempest tests of OpenStack live cloud and display verification results.
-The verification results obtained by running various "rally verify <cmd>" commands including "start", "show", "list" are compared using the "rally-verify compare" command, which are then saved in csv, html and json formats in the "rally-verify" directory.
+The verification results obtained by running various "rally verify <cmd>" commands including "start", "show", "list" are compared using the "rally verify results" command, which are then saved in csv, html and json formats in the "rally-verify" directory.
 Jenkins uses this script by running the 'gate-rally-dsvm-verify' job.