openstack/rally
Code Issues Proposed changes

Merge "Small improvements for rally verify import"

Browse Source
This commit is contained in:
Jenkins 2015-10-03 09:10:14 +00:00 committed by Gerrit Code Review
commit 654c63e328
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/rally.bash_completion
View File

@ -49,7 +49,7 @@ _rally()
OPTS["verify_compare"]="--uuid-1 --uuid-2 --csv --html --json --output-file --threshold"
OPTS["verify_detailed"]="--uuid --sort-by"
OPTS["verify_genconfig"]="--deployment --tempest-config --override"
OPTS["verify_import"]="--deployment --set-name --file --no-use"
OPTS["verify_import"]="--deployment --set --file --no-use"
OPTS["verify_install"]="--deployment --source"
OPTS["verify_list"]=""
OPTS["verify_reinstall"]="--deployment --tempest-config --source"
@ -86,4 +86,4 @@ _rally()
return 0
}
complete -o filenames -F _rally rally
complete -o filenames -F _rally rally

2
rally/api.py
View File

@ -336,7 +336,7 @@ class Verification(object):
return verifier
@classmethod
def import_results(cls, deployment, set_name, log_file=None):
def import_results(cls, deployment, set_name="", log_file=None):
"""Import Tempest tests results into the Rally database.
:param deployment: UUID or name of a deployment

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

@ -91,7 +91,7 @@ class VerifyCommands(object):
@cliutils.args("--deployment", dest="deployment", type=str,
required=False, help="UUID or name of a deployment.")
@cliutils.args("--set-name", dest="set_name", type=str, required=False,
@cliutils.args("--set", dest="set_name", type=str, required=False,
help="Name of tempest test set. Available sets: %s" % ", ".
join(list(consts.TempestTestsSets) +
list(consts.TempestTestsAPI)))
@ -103,7 +103,8 @@ class VerifyCommands(object):
required=False,
help="Don't set new task as default for future operations")
@cliutils.alias("import")
def import_results(self, deployment=None, set_name=None, log_file=None,
@envutils.with_default_deployment(cli_arg_name="deployment")
def import_results(self, deployment=None, set_name="", log_file=None,
do_use=True):
"""Import Tempest tests results into the Rally database.

2
rally/verification/tempest/tempest.py
View File

@ -398,4 +398,4 @@ class Tempest(object):
self.verification.start_verifying(set_name)
self._save_results(log_file)
else:
LOG.error("No import file specified.")
LOG.error("No log file to import results was specified.")

2
tests/unit/cli/commands/test_verify.py
View File

@ -99,7 +99,7 @@ class VerifyCommandsTestCase(test.TestCase):
deployment_id = "fake_uuid"
mock_verification_import_results.return_value = (None, None)
self.verify.import_results(deployment=deployment_id, do_use=False)
default_set_name = None
default_set_name = ""
default_log_file = None
mock_verification_import_results.assert_called_once_with(