Merge "Update yardstick framework architecture in userguide"

[yardstick.git] / yardstick / cmd / cli.py

diff --git a/yardstick/cmd/cli.py b/yardstick/cmd/cli.py
index 6281bb8..79f66e5 100644 (file)
--- a/yardstick/cmd/cli.py
+++ b/yardstick/cmd/cli.py
@@ -20,24 +20,21 @@ from pkg_resources import get_distribution
 from argparse import RawDescriptionHelpFormatter
 from oslo_config import cfg
 
 from argparse import RawDescriptionHelpFormatter
 from oslo_config import cfg
 

-from yardstick import _init_logging, LOG
+from yardstick import _init_logging, _LOG_STREAM_HDLR

 from yardstick.cmd.commands import task
 from yardstick.cmd.commands import runner
 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 task
 from yardstick.cmd.commands import runner
 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 report

 
 CONF = cfg.CONF
 cli_opts = [
     cfg.BoolOpt('debug',
                 short='d',
                 default=False,
 
 CONF = cfg.CONF
 cli_opts = [
     cfg.BoolOpt('debug',
                 short='d',
                 default=False,

-                help='increase output verbosity to debug'),
-    cfg.BoolOpt('verbose',
-                short='v',
-                default=False,
-                help='increase output verbosity to info')
+                help='increase output verbosity to debug')

 ]
 CONF.register_cli_opts(cli_opts)
 
 ]
 CONF.register_cli_opts(cli_opts)
 


@@ -66,7 +63,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):


@@ -132,11 +130,8 @@ class YardstickCLI():
     def _handle_global_opts(self):
 
         _init_logging()
     def _handle_global_opts(self):
 
         _init_logging()

-        if CONF.verbose:
-            LOG.setLevel(logging.INFO)
-

         if CONF.debug:
         if CONF.debug:

-            LOG.setLevel(logging.DEBUG)
+            _LOG_STREAM_HDLR.setLevel(logging.DEBUG)

 
     def _dispath_func_notask(self):
 
 
     def _dispath_func_notask(self):