Merge "Fix for datasource field value"

[yardstick.git] / yardstick / benchmark / core / scenario.py

diff --git a/yardstick/benchmark/core/scenario.py b/yardstick/benchmark/core/scenario.py
index e228054..3366172 100644 (file)
--- a/yardstick/benchmark/core/scenario.py
+++ b/yardstick/benchmark/core/scenario.py
@@ -9,28 +9,29 @@
 
 """ Handler for yardstick command 'scenario' """
 
+from __future__ import absolute_import
+import prettytable
+
 from yardstick.benchmark.scenarios.base import Scenario
-from yardstick.benchmark.core import print_hbar
 
 
-class Scenarios(object):
-    '''Scenario commands.
+class Scenarios(object):    # pragma: no cover
+    """Scenario commands.
 
        Set of commands to discover and display scenario types.
-    '''
+    """
 
-    def list_all(self, args):
-        '''List existing scenario types'''
+    def list_all(self, *args):
+        """List existing scenario types"""
         types = Scenario.get_types()
-        print_hbar(78)
-        print("| %-16s | %-60s" % ("Type", "Description"))
-        print_hbar(78)
-        for stype in types:
-            print("| %-16s | %-60s" % (stype.__scenario_type__,
-                                       stype.__doc__.split("\n")[0]))
-        print_hbar(78)
+        scenario_table = prettytable.PrettyTable(['Type', 'Description'])
+        scenario_table.align = 'l'
+        for scenario_class in types:
+            scenario_table.add_row([scenario_class.get_scenario_type(),
+                                    scenario_class.get_description()])
+        print(scenario_table)
 
     def show(self, args):
-        '''Show details of a specific scenario type'''
+        """Show details of a specific scenario type"""
         stype = Scenario.get_cls(args.type[0])
-        print stype.__doc__
+        print(stype.__doc__)