From 010bc61cc942d3b0c9663c5a8823a4ad2eba98a1 Mon Sep 17 00:00:00 2001 From: Jean-Emile DARTOIS Date: Mon, 21 Dec 2015 09:54:56 +0100 Subject: [PATCH] Change default strategy to DummyStrategy The aim of this patchset is to change the default strategy and set invoke_on_load to False. Change-Id: I0e374993614f465b11a22e33008f7026642154ee --- watcher/decision_engine/strategy/loading/base.py | 8 +++++++- watcher/decision_engine/strategy/loading/default.py | 7 ++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/watcher/decision_engine/strategy/loading/base.py b/watcher/decision_engine/strategy/loading/base.py index 775f84399..dc668e9df 100644 --- a/watcher/decision_engine/strategy/loading/base.py +++ b/watcher/decision_engine/strategy/loading/base.py @@ -20,19 +20,25 @@ import abc from oslo_log import log import six +from watcher.decision_engine.strategy.strategies.dummy_strategy import \ + DummyStrategy + LOG = log.getLogger(__name__) @six.add_metaclass(abc.ABCMeta) class BaseStrategyLoader(object): + default_strategy_cls = DummyStrategy + @abc.abstractmethod def load_available_strategies(self): - raise NotImplementedError() # pragma:no cover + raise NotImplementedError() def load(self, strategy_to_load=None): strategy_selected = None try: available_strategies = self.load_available_strategies() + LOG.debug("Available strategies: %s ", available_strategies) strategy_cls = available_strategies.get( strategy_to_load, self.default_strategy_cls ) diff --git a/watcher/decision_engine/strategy/loading/default.py b/watcher/decision_engine/strategy/loading/default.py index 357bda229..df91d50d1 100644 --- a/watcher/decision_engine/strategy/loading/default.py +++ b/watcher/decision_engine/strategy/loading/default.py @@ -23,19 +23,16 @@ from oslo_log import log from stevedore import ExtensionManager from watcher.decision_engine.strategy.loading.base import BaseStrategyLoader -from watcher.decision_engine.strategy.strategies.basic_consolidation import \ - BasicConsolidation + LOG = log.getLogger(__name__) class DefaultStrategyLoader(BaseStrategyLoader): - default_strategy_cls = BasicConsolidation - def load_available_strategies(self): extension_manager = ExtensionManager( namespace='watcher_strategies', - invoke_on_load=True, + invoke_on_load=False, ) return {ext.name: ext.plugin for ext in extension_manager.extensions}