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 6281bb8..0bc7c16 100644 (file)
--- a/yardstick/cmd/cli.py
+++ b/yardstick/cmd/cli.py
@@ -20,24 +20,23 @@ 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
+from yardstick.common import import_tools
+

 
 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)
 


@@ -56,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


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


@@ -110,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",


@@ -132,19 +133,16 @@ 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 _dispatch_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 _dispatch_func_task(self, task_id):

 
         # dispatch to category parser
         func = CONF.category.func
 
         # dispatch to category parser
         func = CONF.category.func


@@ -164,7 +162,7 @@ class YardstickCLI():
 
             self._handle_global_opts()
 
 
             self._handle_global_opts()
 

-            self._dispath_func_notask()
+            self._dispatch_func_notask()

         finally:
             self._clear_config_opts()
 
         finally:
             self._clear_config_opts()
 


@@ -177,6 +175,6 @@ class YardstickCLI():
 
             self._handle_global_opts()
 
 
             self._handle_global_opts()
 

-            self._dispath_func_task(task_id)
+            self._dispatch_func_task(task_id)

         finally:
             self._clear_config_opts()
         finally:
             self._clear_config_opts()