diff options
author | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-01-23 16:23:57 +0000 |
---|---|---|
committer | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-01-30 10:13:40 +0000 |
commit | 352478d837893167b90d321e22f276ce65f7ce43 (patch) | |
tree | 6f7c91b5f78871c4b509eeeba183682967e98fca /yardstick/benchmark/scenarios/base.py | |
parent | fa6a71d6a0f654d9e85a6dd8f73c1173f75ccdde (diff) |
Make 'Scenario' classes plugable
This patch makes yardstick.benchmark.scenario.base:Scenario classes
plugable.
A new entry point is added to the setup. This entry point could be
extended in other plugin projects to add new Scenario classes.
E.g.: take a look at [1]. This is a Yardstick plugin example project.
Clone the project and execute, from the project directory:
$ sudo -EH python setup.py install
This will add a new module to python ('yardstick-new-plugin') and a
new Scenario class.
Now list the scenarios in Yardstick:
$ yardstick scenario list
...
| SpecCPU2006_for_VM | Spec CPU2006 benchmark for Virtual Machine |
| SpecCPU2006 | Spec CPU2006 benchmark |
| Dummy2 | Execute Dummy (v2!) echo |
+-----------------------+--------------------------------------------+
[1] https://github.com/ralonsoh/yardstick_new_plugin
JIRA: YARDSTICK-910
Change-Id: Ib70ee9bf4dc7ff91d1dd6377317b313288e36bff
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Diffstat (limited to 'yardstick/benchmark/scenarios/base.py')
-rw-r--r-- | yardstick/benchmark/scenarios/base.py | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/yardstick/benchmark/scenarios/base.py b/yardstick/benchmark/scenarios/base.py index 7af85834c..10a728828 100644 --- a/yardstick/benchmark/scenarios/base.py +++ b/yardstick/benchmark/scenarios/base.py @@ -16,20 +16,34 @@ # yardstick comment: this is a modified copy of # rally/rally/benchmark/scenarios/base.py -""" Scenario base class -""" +from stevedore import extension -from __future__ import absolute_import import yardstick.common.utils as utils +def _iter_scenario_classes(scenario_type=None): + """Generator over all 'Scenario' subclasses + + This function will iterate over all 'Scenario' subclasses defined in this + project and will load any class introduced by any installed plugin project, + defined in 'entry_points' section, under 'yardstick.scenarios' subsection. + """ + extension.ExtensionManager(namespace='yardstick.scenarios', + invoke_on_load=False) + for scenario in utils.itersubclasses(Scenario): + if not scenario_type: + yield scenario + elif getattr(scenario, '__scenario_type__', None) == scenario_type: + yield scenario + + class Scenario(object): def setup(self): """ default impl for scenario setup """ pass - def run(self, args): + def run(self, *args): """ catcher for not implemented run methods in subclasses """ raise RuntimeError("run method not implemented") @@ -41,16 +55,15 @@ class Scenario(object): def get_types(): """return a list of known runner type (class) names""" scenarios = [] - for scenario in utils.itersubclasses(Scenario): + for scenario in _iter_scenario_classes(): scenarios.append(scenario) return scenarios @staticmethod def get_cls(scenario_type): """return class of specified type""" - for scenario in utils.itersubclasses(Scenario): - if scenario_type == scenario.__scenario_type__: - return scenario + for scenario in _iter_scenario_classes(scenario_type): + return scenario raise RuntimeError("No such scenario type %s" % scenario_type) @@ -58,11 +71,8 @@ class Scenario(object): def get(scenario_type): """Returns instance of a scenario runner for execution type. """ - for scenario in utils.itersubclasses(Scenario): - if scenario_type == scenario.__scenario_type__: - return scenario.__module__ + "." + scenario.__name__ - - raise RuntimeError("No such scenario type %s" % scenario_type) + scenario = Scenario.get_cls(scenario_type) + return scenario.__module__ + "." + scenario.__name__ @classmethod def get_scenario_type(cls): |