From 178e98958ab57c3f86dbc9b2c7a609a679a97062 Mon Sep 17 00:00:00 2001
From: Yaroslav Lobankov <ylobankov@mirantis.com>
Date: Fri, 2 Oct 2015 17:09:21 +0300
Subject: [PATCH] Small improvements for `rally verify import`

1. Optional arguement "--set-name" was renamed into "--set" for
   consistency. See `rally verify start`.

2. The @envutils.with_default_deployment decorator was added to
   the import_results method.

3. When we import some results and don't specify set name for tests,
   in the verification table set name for these tests will be specified
   as None. So the default value of the "set_name" parameter was changed
   from None to "" to avoid this issue.

Change-Id: Icd6659f1a78c6a426c50c67cc31b7cd85f9fbd11
---
 etc/rally.bash_completion              | 4 ++--
 rally/api.py                           | 2 +-
 rally/cli/commands/verify.py           | 5 +++--
 rally/verification/tempest/tempest.py  | 2 +-
 tests/unit/cli/commands/test_verify.py | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/rally.bash_completion b/etc/rally.bash_completion
index 220b8dcdad..e807cd15d3 100644
--- a/etc/rally.bash_completion
+++ b/etc/rally.bash_completion
@@ -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
\ No newline at end of file
diff --git a/rally/api.py b/rally/api.py
index 4b0c9e3cd5..1b819882f5 100644
--- a/rally/api.py
+++ b/rally/api.py
@@ -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
diff --git a/rally/cli/commands/verify.py b/rally/cli/commands/verify.py
index b6cc313bf5..525127416f 100644
--- a/rally/cli/commands/verify.py
+++ b/rally/cli/commands/verify.py
@@ -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.
 
diff --git a/rally/verification/tempest/tempest.py b/rally/verification/tempest/tempest.py
index 5919ad047b..46662c42dd 100644
--- a/rally/verification/tempest/tempest.py
+++ b/rally/verification/tempest/tempest.py
@@ -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.")
diff --git a/tests/unit/cli/commands/test_verify.py b/tests/unit/cli/commands/test_verify.py
index 901c5d5352..77dbf3355d 100644
--- a/tests/unit/cli/commands/test_verify.py
+++ b/tests/unit/cli/commands/test_verify.py
@@ -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(