Added 'dummy' entrypoint within watcher_strategies
This should make our 'dummy' strategy available for use. I also removed all previously defined default goals, which means that they will have to define it themselves from now on. This can also be useful for future integration tests. Change-Id: I6c43eba941022a88851a199b56a6c20f017b9e71 DocImpact Closes-Bug: #1520178
This commit is contained in:
committed by
David TARDIVEL
parent
a809b8d52c
commit
9078e1e138
@@ -16,23 +16,21 @@
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
from watcher.common.exception import WatcherException
|
||||
from watcher.decision_engine.strategy.loader import StrategyLoader
|
||||
from watcher.decision_engine.strategy.selector.base import Selector
|
||||
from watcher.objects.audit_template import Goal
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
goals = {
|
||||
'SERVERS_CONSOLIDATION': 'basic',
|
||||
'MINIMIZE_ENERGY_CONSUMPTION': 'basic',
|
||||
'BALANCE_LOAD': 'basic',
|
||||
'MINIMIZE_LICENSING_COST': 'basic',
|
||||
'PREPARE_PLANNED_OPERATION': 'basic'
|
||||
}
|
||||
default_goals = {'DUMMY': 'dummy'}
|
||||
|
||||
WATCHER_GOALS_OPTS = [
|
||||
cfg.DictOpt('goals',
|
||||
default=goals, help='Goals used for the optimization ')
|
||||
cfg.DictOpt(
|
||||
'goals',
|
||||
default=default_goals,
|
||||
help='Goals used for the optimization. '
|
||||
'Maps each goal to an associated strategy (for example: '
|
||||
'BASIC_CONSOLIDATION:basic, MY_GOAL:my_strategy_1)'),
|
||||
]
|
||||
goals_opt_group = cfg.OptGroup(name='watcher_goals',
|
||||
title='Goals available for the optimization')
|
||||
@@ -46,8 +44,13 @@ class StrategySelector(Selector):
|
||||
self.strategy_loader = StrategyLoader()
|
||||
|
||||
def define_from_goal(self, goal_name):
|
||||
if goal_name is None:
|
||||
goal_name = Goal.SERVERS_CONSOLIDATION
|
||||
|
||||
strategy_to_load = CONF.watcher_goals.goals[goal_name]
|
||||
return self.strategy_loader.load(strategy_to_load)
|
||||
strategy_to_load = None
|
||||
try:
|
||||
strategy_to_load = CONF.watcher_goals.goals[goal_name]
|
||||
return self.strategy_loader.load(strategy_to_load)
|
||||
except KeyError as exc:
|
||||
LOG.exception(exc)
|
||||
raise WatcherException(
|
||||
"Incorrect mapping: could not find "
|
||||
"associated strategy for '%s'" % goal_name
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user