X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcore%2Fscenario.py;h=3366172a5271309643a8bf676de6ec39a3a04458;hb=1e6069603e456d44c7ebdf430c2568005e3bdd8d;hp=e228054ee7f672e1524e7859eac8f3f96d68200e;hpb=45db0fdabb4585b96756a390650181a3c46facf7;p=yardstick.git diff --git a/yardstick/benchmark/core/scenario.py b/yardstick/benchmark/core/scenario.py index e228054ee..3366172a5 100644 --- 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__)