Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Added http concurrency test suite for agnostic VNF"
[yardstick.git]
/
yardstick
/
cmd
/
cli.py
diff --git
a/yardstick/cmd/cli.py
b/yardstick/cmd/cli.py
index
1f8dfee
..
0bc7c16
100644
(file)
--- a/
yardstick/cmd/cli.py
+++ b/
yardstick/cmd/cli.py
@@
-27,6
+27,9
@@
from yardstick.cmd.commands import scenario
from yardstick.cmd.commands import testcase
from yardstick.cmd.commands import plugin
from yardstick.cmd.commands import env
from yardstick.cmd.commands import testcase
from yardstick.cmd.commands import plugin
from yardstick.cmd.commands import env
+from yardstick.cmd.commands import report
+from yardstick.common import import_tools
+
CONF = cfg.CONF
cli_opts = [
CONF = cfg.CONF
cli_opts = [
@@
-52,7
+55,8
@@
def find_config_files(path_list):
return None
return None
-class YardstickCLI():
+@import_tools.decorator_banned_modules
+class YardstickCLI(object): # pragma: no cover
"""Command-line interface to yardstick"""
# Command categories
"""Command-line interface to yardstick"""
# Command categories
@@
-62,7
+66,8
@@
class YardstickCLI():
'scenario': scenario.ScenarioCommands,
'testcase': testcase.TestcaseCommands,
'plugin': plugin.PluginCommands,
'scenario': scenario.ScenarioCommands,
'testcase': testcase.TestcaseCommands,
'plugin': plugin.PluginCommands,
- 'env': env.EnvCommand
+ 'env': env.EnvCommand,
+ 'report': report.ReportCommands
}
def __init__(self):
}
def __init__(self):
@@
-106,7
+111,7
@@
class YardstickCLI():
# register subcommands to parse additional command line arguments
def parser(subparsers):
# register subcommands to parse additional command line arguments
def parser(subparsers):
- self._add_command_parsers(
YardstickCLI
.categories, subparsers)
+ self._add_command_parsers(
self
.categories, subparsers)
category_opt = cfg.SubCommandOpt("category",
title="Command categories",
category_opt = cfg.SubCommandOpt("category",
title="Command categories",
@@
-131,13
+136,13
@@
class YardstickCLI():
if CONF.debug:
_LOG_STREAM_HDLR.setLevel(logging.DEBUG)
if CONF.debug:
_LOG_STREAM_HDLR.setLevel(logging.DEBUG)
- def _dispath_func_notask(self):
+ def _dispat
c
h_func_notask(self):
# dispatch to category parser
func = CONF.category.func
func(CONF.category)
# dispatch to category parser
func = CONF.category.func
func(CONF.category)
- def _dispath_func_task(self, task_id):
+ def _dispat
c
h_func_task(self, task_id):
# dispatch to category parser
func = CONF.category.func
# dispatch to category parser
func = CONF.category.func
@@
-157,7
+162,7
@@
class YardstickCLI():
self._handle_global_opts()
self._handle_global_opts()
- self._dispath_func_notask()
+ self._dispat
c
h_func_notask()
finally:
self._clear_config_opts()
finally:
self._clear_config_opts()
@@
-170,6
+175,6
@@
class YardstickCLI():
self._handle_global_opts()
self._handle_global_opts()
- self._dispath_func_task(task_id)
+ self._dispat
c
h_func_task(task_id)
finally:
self._clear_config_opts()
finally:
self._clear_config_opts()