Fixed bug of duplicating name for option '--verbose'

Reasons:
    - Name 'verbose' is very common to use, so it caused name conflict
      while running both Cloudvalidation Dashboard and OSTF Adapter
Changes:
    - Renamed option '--verbose' to '--show-full-report'

Change-Id: I795781962c3216e545df0a201ec9cbd2b1ae53c4
Closes-Bug: #1448096
This commit is contained in:
Oleksandr Kyrylchuk 2015-04-24 15:12:54 +03:00
parent c148555137
commit d4da1fe15d
2 changed files with 13 additions and 7 deletions

View File

@ -59,7 +59,7 @@ class OSTF(object):
'tests': "\n".join(plugin().descriptor()['tests'])})
@cmd.args("--no-format", dest="no_format")
@cmd.args("--verbose", dest="verbose")
@cmd.args("--show-full-report", dest="show_full_report")
@cmd.args("--validation-plugin-name", dest="validation_plugin_name")
def run_suites(self, validation_plugin_name):
for plugin in validation_plugin.VALIDATION_PLUGINS:
@ -67,22 +67,26 @@ class OSTF(object):
descriptor = _plugin.descriptor()
if descriptor['name'] == validation_plugin_name:
reports = plugin().run_suites_within_cli()
utils.print_formatted(reports, CONF.no_format, CONF.verbose)
utils.print_formatted(reports,
CONF.no_format,
CONF.show_full_report)
@cmd.args("--suite", dest="suite")
@cmd.args("--validation-plugin-name", dest="validation_plugin_name")
@cmd.args("--no-format", dest="no_format")
@cmd.args("--verbose", dest="verbose")
@cmd.args("--show-full-report", dest="show_full_report")
def run_suite(self, validation_plugin_name, suite):
for plugin in validation_plugin.VALIDATION_PLUGINS:
_plugin = plugin(load_tests=False)
descriptor = _plugin.descriptor()
if descriptor['name'] == validation_plugin_name:
reports = plugin().run_suite_within_cli(suite)
utils.print_formatted(reports, CONF.no_format, CONF.verbose)
utils.print_formatted(reports,
CONF.no_format,
CONF.show_full_report)
@cmd.args("--no-format", dest="no_format")
@cmd.args("--verbose", dest="verbose")
@cmd.args("--show-full-report", dest="show_full_report")
@cmd.args("--validation-plugin-name", dest="validation_plugin_name")
@cmd.args("--test", dest="test")
def run_test(self, validation_plugin_name, test):
@ -91,7 +95,9 @@ class OSTF(object):
descriptor = _plugin.descriptor()
if descriptor['name'] == validation_plugin_name:
reports = plugin().run_test(test)
utils.print_formatted(reports, CONF.no_format, CONF.verbose)
utils.print_formatted(reports,
CONF.no_format,
CONF.show_full_report)
CATS = {

View File

@ -28,7 +28,7 @@ common_opts = [
cli_opts = [
cfg.BoolOpt('no-format', short='F', default=False, required=False),
cfg.BoolOpt('verbose', short='V', default=False, required=False)
cfg.BoolOpt('show-full-report', short='R', default=False, required=False)
]
sanity_group = cfg.OptGroup("sanity", "Sanity configuration group.")