Merge "Tidy up - Rename Base"

watcher/decision_engine/strategy/base.py

@@ -49,7 +49,7 @@ class BaseStrategy(object):
         :param model: The name of the strategy to execute (loaded dynamically)
         :type model: str
         :return: A computed solution (via a placement algorithm)
-        :rtype: :class:`watcher.decision_engine.solution.base.Solution`
+        :rtype: :class:`watcher.decision_engine.solution.base.BaseSolution`
         """
 
     @property

watcher/decision_engine/strategy/selector/base.py

@@ -21,7 +21,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Selector(object):
+class BaseSelector(object):
     @abc.abstractmethod
     def define_from_goal(self, goal_name):
         raise NotImplementedError(

watcher/decision_engine/strategy/selector/default.py

@@ -18,7 +18,7 @@ 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.decision_engine.strategy.selector.base import BaseSelector
 LOG = log.getLogger(__name__)
 CONF = cfg.CONF
 
@@ -38,7 +38,7 @@ CONF.register_group(goals_opt_group)
 CONF.register_opts(WATCHER_GOALS_OPTS, goals_opt_group)
 
 
-class StrategySelector(Selector):
+class StrategySelector(BaseSelector):
 
     def __init__(self):
         self.strategy_loader = StrategyLoader()