openstack/rally
Code Issues Proposed changes

Merge "[CLI] Fix mentions of deprecated command `rally verify compare'"

Browse Source
This commit is contained in:
Jenkins 2016-10-21 15:40:54 +00:00 committed by Gerrit Code Review
commit 4dbbda62f4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rally/cli/commands/verify.py
View File

@ -235,7 +235,7 @@ class VerifyCommands(object):
@cliutils.suppress_warnings @cliutils.suppress_warnings
def results(self, uuids=None, output_file=None, def results(self, uuids=None, output_file=None,
output_html=False, output_json=False, output_csv=False): 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 verification: UUID of a verification
:param output_file: Path to a file to save results :param output_file: Path to a file to save results
@ -375,9 +375,9 @@ class VerifyCommands(object):
self.show(verification, sort_by, True) self.show(verification, sort_by, True)
def compare(self, *args, **kwargs): def compare(self, *args, **kwargs):
"""Deprecated.""" """Deprecated. Use `rally verify results' instead."""
# NOTE(amaretskiy): this command is deprecated in favor of # NOTE(amaretskiy): deprecated since 'rally task results' has been
# improved 'rally task results' # improved and does same job much better
print("This command is deprecated. Use 'rally task results' instead.") print("This command is deprecated. Use 'rally task results' instead.")
return 1 return 1

6
rally/ui/templates/ci/index_verify.html
View File

@ -113,15 +113,15 @@
{% if compare %} {% if compare %}
<span class="{{ compare.html.status }}">[{{ compare.html.status }}]</span> <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>] <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> <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>] <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> <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>] <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 %} {% endif %}
<span class="{{ list.status }}">[{{ list.status }}]</span> <span class="{{ list.status }}">[{{ list.status }}]</span>

2
tests/ci/README.rst
View File

@ -18,7 +18,7 @@ This script runs a functional tests suite for Rally CLI. The tests call a range
rally-verify.sh 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. 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. Jenkins uses this script by running the 'gate-rally-dsvm-verify' job.