Merge "Tidy up - Rename Base"

watcher/applier/base.py

@@ -22,7 +22,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Applier(object):
+class BaseApplier(object):
     @abc.abstractmethod
     def execute(self, action_plan_uuid):
         raise NotImplementedError(

watcher/applier/default.py

@@ -16,13 +16,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.applier.base import Applier
+
+from watcher.applier.base import BaseApplier
 from watcher.applier.execution.executor import ActionPlanExecutor
 from watcher.objects import Action
 from watcher.objects import ActionPlan
 
 
-class DefaultApplier(Applier):
+class DefaultApplier(BaseApplier):
     def __init__(self, manager_applier, context):
         super(DefaultApplier, self).__init__()
         self.manager_applier = manager_applier

watcher/applier/mapping/default.py

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 from watcher.applier.mapping.base import BaseActionMapper
 from watcher.applier.primitives.change_nova_service_state import \
     ChangeNovaServiceState

watcher/applier/primitives/change_nova_service_state.py

@@ -20,6 +20,7 @@
 
 from oslo_config import cfg
 
+
 from watcher.applier.primitives.base import BasePrimitive
 from watcher.applier.primitives.wrapper.nova_wrapper import NovaWrapper
 from watcher.applier.promise import Promise

watcher/applier/primitives/migration.py

@@ -21,6 +21,7 @@ from keystoneclient.auth.identity import v3
 from keystoneclient import session
 from oslo_config import cfg
 
+
 from watcher.applier.primitives.base import BasePrimitive
 from watcher.applier.primitives.wrapper.nova_wrapper import NovaWrapper
 from watcher.applier.promise import Promise

watcher/applier/primitives/nop.py

@@ -19,6 +19,7 @@
 
 from oslo_log import log
 
+
 from watcher.applier.primitives.base import BasePrimitive
 from watcher.applier.promise import Promise
 

watcher/applier/primitives/power_state.py

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 from watcher.applier.primitives.base import BasePrimitive
 from watcher.applier.promise import Promise
 

watcher/db/api.py

@@ -16,12 +16,10 @@ Base classes for storage engines
 """
 
 import abc
-
 from oslo_config import cfg
 from oslo_db import api as db_api
 import six
 
-
 _BACKEND_MAPPING = {'sqlalchemy': 'watcher.db.sqlalchemy.api'}
 IMPL = db_api.DBAPI.from_config(cfg.CONF, backend_mapping=_BACKEND_MAPPING,
                                 lazy=True)
@@ -33,13 +31,9 @@ def get_instance():
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Connection(object):
+class BaseConnection(object):
     """Base class for storage system connections."""
 
-    @abc.abstractmethod
-    def __init__(self):
-        """Constructor."""
-
     @abc.abstractmethod
     def get_audit_template_list(self, context, columns=None, filters=None,
                                 limit=None, marker=None, sort_key=None,
@@ -130,6 +124,7 @@ class Connection(object):
         :raises: AuditTemplateNotFound
         :raises: InvalidParameterValue
         """
+
     @abc.abstractmethod
     def soft_delete_audit_template(self, audit_template_id):
         """Soft delete an audit_template.
@@ -308,7 +303,7 @@ class Connection(object):
 
     @abc.abstractmethod
     def get_action_plan_list(
-        self, context, columns=None, filters=None, limit=None,
+            self, context, columns=None, filters=None, limit=None,
             marker=None, sort_key=None, sort_dir=None):
         """Get specific columns for matching action plans.
 

watcher/db/sqlalchemy/api.py

@@ -102,7 +102,7 @@ def _paginate_query(model, limit=None, marker=None, sort_key=None,
     return query.all()
 
 
-class Connection(api.Connection):
+class Connection(api.BaseConnection):
     """SqlAlchemy connection."""
 
     def __init__(self):

watcher/decision_engine/actions/hypervisor_state.py

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 from watcher.decision_engine.actions.base import BaseAction
 from watcher.decision_engine.model.hypervisor_state import HypervisorState
 

watcher/decision_engine/actions/nop.py

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+
 from watcher.decision_engine.actions.base import BaseAction
 
 

watcher/decision_engine/actions/power_state.py

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 from watcher.decision_engine.actions.base import BaseAction
 from watcher.decision_engine.model.power_state import PowerState
 
@@ -47,5 +48,5 @@ class ChangePowerState(BaseAction):
         self._target = t
 
     def __str__(self):
-        return "ChangePowerState {} => {} ".format(
+        return "ChangePowerState {} => {} ".format(self.target,
-            self.target, self.powerstate)
+                                                   self.powerstate)

watcher/decision_engine/planner/base.py

@@ -21,7 +21,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Planner(object):
+class BasePlanner(object):
     @abc.abstractmethod
     def schedule(self, context, audit_uuid, solution):
         """The  planner receives a solution to schedule

watcher/decision_engine/planner/default.py

@@ -21,7 +21,7 @@ from oslo_log import log
 from enum import Enum
 from watcher.common.exception import MetaActionNotFound
 from watcher.common import utils
-from watcher.decision_engine.planner.base import Planner
+from watcher.decision_engine.planner.base import BasePlanner
 
 from watcher import objects
 
@@ -57,7 +57,7 @@ priority_primitives = {
 }
 
 
-class DefaultPlanner(Planner):
+class DefaultPlanner(BasePlanner):
     def create_action(self, action_plan_id, action_type, applies_to=None,
                       src=None,
                       dst=None,

watcher/decision_engine/solution/base.py

@@ -21,7 +21,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Solution(object):
+class BaseSolution(object):
     def __init__(self):
         self._origin = None
         self._model = None

watcher/decision_engine/solution/default.py

@@ -17,12 +17,12 @@
 # limitations under the License.
 #
 from oslo_log import log
-from watcher.decision_engine.solution.base import Solution
+from watcher.decision_engine.solution.base import BaseSolution
 
 LOG = log.getLogger(__name__)
 
 
-class DefaultSolution(Solution):
+class DefaultSolution(BaseSolution):
     def __init__(self):
         """Stores a set of actions generated by a strategy
 

watcher/decision_engine/solution/solution_comparator.py

@@ -21,7 +21,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Solution(object):
+class BaseSolutionComparator(object):
     @abc.abstractmethod
     def compare(self, sol1, sol2):
         raise NotImplementedError(

watcher/decision_engine/solution/solution_evaluator.py

@@ -21,7 +21,7 @@ import six
 
 
 @six.add_metaclass(abc.ABCMeta)
-class SolutionEvaluator(object):
+class BaseSolutionEvaluator(object):
     @abc.abstractmethod
     def evaluate(self, solution):
         raise NotImplementedError(

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()

watcher/tests/api/v1/test_actions.py

@@ -427,7 +427,7 @@ class TestPatch(api_base.FunctionalTest):
         super(TestPatch, self).setUp()
         obj_utils.create_test_action_plan(self.context)
         self.action = obj_utils.create_test_action(self.context, next=None)
-        p = mock.patch.object(db_api.Connection, 'update_action')
+        p = mock.patch.object(db_api.BaseConnection, 'update_action')
         self.mock_action_update = p.start()
         self.mock_action_update.side_effect = self._simulate_rpc_action_update
         self.addCleanup(p.stop)
@@ -553,7 +553,7 @@ class TestDelete(api_base.FunctionalTest):
         super(TestDelete, self).setUp()
         obj_utils.create_test_action_plan(self.context)
         self.action = obj_utils.create_test_action(self.context, next=None)
-        p = mock.patch.object(db_api.Connection, 'update_action')
+        p = mock.patch.object(db_api.BaseConnection, 'update_action')
         self.mock_action_update = p.start()
         self.mock_action_update.side_effect = self._simulate_rpc_action_update
         self.addCleanup(p.stop)

watcher/tests/api/v1/test_actions_plans.py

@@ -285,7 +285,7 @@ class TestDelete(api_base.FunctionalTest):
         super(TestDelete, self).setUp()
         self.action_plan = obj_utils.create_action_plan_without_audit(
             self.context)
-        p = mock.patch.object(db_api.Connection, 'destroy_action_plan')
+        p = mock.patch.object(db_api.BaseConnection, 'destroy_action_plan')
         self.mock_action_plan_delete = p.start()
         self.mock_action_plan_delete.side_effect = \
             self._simulate_rpc_action_plan_delete
@@ -317,7 +317,7 @@ class TestPatch(api_base.FunctionalTest):
         super(TestPatch, self).setUp()
         self.action_plan = obj_utils.create_action_plan_without_audit(
             self.context)
-        p = mock.patch.object(db_api.Connection, 'update_action_plan')
+        p = mock.patch.object(db_api.BaseConnection, 'update_action_plan')
         self.mock_action_plan_update = p.start()
         self.mock_action_plan_update.side_effect = \
             self._simulate_rpc_action_plan_update

watcher/tests/api/v1/test_audit_templates.py

@@ -213,7 +213,7 @@ class TestPatch(api_base.FunctionalTest):
         super(TestPatch, self).setUp()
         self.audit_template = obj_utils.create_test_audit_template(
             self.context)
-        p = mock.patch.object(db_api.Connection, 'update_audit_template')
+        p = mock.patch.object(db_api.BaseConnection, 'update_audit_template')
         self.mock_audit_template_update = p.start()
         self.mock_audit_template_update.side_effect = \
             self._simulate_rpc_audit_template_update
@@ -340,7 +340,7 @@ class TestPost(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestPost, self).setUp()
-        p = mock.patch.object(db_api.Connection, 'create_audit_template')
+        p = mock.patch.object(db_api.BaseConnection, 'create_audit_template')
         self.mock_create_audit_template = p.start()
         self.mock_create_audit_template.side_effect = (
             self._simulate_rpc_audit_template_create)
@@ -417,7 +417,7 @@ class TestDelete(api_base.FunctionalTest):
         super(TestDelete, self).setUp()
         self.audit_template = obj_utils.create_test_audit_template(
             self.context)
-        p = mock.patch.object(db_api.Connection, 'update_audit_template')
+        p = mock.patch.object(db_api.BaseConnection, 'update_audit_template')
         self.mock_audit_template_update = p.start()
         self.mock_audit_template_update.side_effect = \
             self._simulate_rpc_audit_template_update

watcher/tests/api/v1/test_audits.py

@@ -319,7 +319,7 @@ class TestPatch(api_base.FunctionalTest):
         super(TestPatch, self).setUp()
         obj_utils.create_test_audit_template(self.context)
         self.audit = obj_utils.create_test_audit(self.context)
-        p = mock.patch.object(db_api.Connection, 'update_audit')
+        p = mock.patch.object(db_api.BaseConnection, 'update_audit')
         self.mock_audit_update = p.start()
         self.mock_audit_update.side_effect = self._simulate_rpc_audit_update
         self.addCleanup(p.stop)
@@ -414,7 +414,7 @@ class TestPost(api_base.FunctionalTest):
     def setUp(self):
         super(TestPost, self).setUp()
         obj_utils.create_test_audit_template(self.context)
-        p = mock.patch.object(db_api.Connection, 'create_audit')
+        p = mock.patch.object(db_api.BaseConnection, 'create_audit')
         self.mock_create_audit = p.start()
         self.mock_create_audit.side_effect = (
             self._simulate_rpc_audit_create)
@@ -520,7 +520,7 @@ class TestDelete(api_base.FunctionalTest):
         super(TestDelete, self).setUp()
         obj_utils.create_test_audit_template(self.context)
         self.audit = obj_utils.create_test_audit(self.context)
-        p = mock.patch.object(db_api.Connection, 'update_audit')
+        p = mock.patch.object(db_api.BaseConnection, 'update_audit')
         self.mock_audit_update = p.start()
         self.mock_audit_update.side_effect = self._simulate_rpc_audit_update
         self.addCleanup(p.stop)

watcher/tests/decision_engine/test_default_planner.py

@@ -24,7 +24,6 @@ from watcher.decision_engine.planner.default import DefaultPlanner
 from watcher.decision_engine.solution.default import DefaultSolution
 from watcher.decision_engine.strategy.basic_consolidation import \
     BasicConsolidation
-
 from watcher.tests.db import base
 from watcher.tests.db import utils as db_utils
 from watcher.tests.decision_engine.faker_cluster_state import \
@@ -59,11 +58,9 @@ class SolutionFakerSingleHyp(object):
 
 
 class TestActionScheduling(base.DbTestCase):
-
     scenarios = [
         (str(action_cls), {"fake_action": mock.Mock(spec=action_cls)})
-        for action_cls in BaseAction.__subclasses__()
+        for action_cls in BaseAction.__subclasses__()]
-        ]
 
     def test_schedule_actions(self):
         default_planner = DefaultPlanner()
@@ -72,8 +69,8 @@ class TestActionScheduling(base.DbTestCase):
         dummy_solution.add_change_request(self.fake_action)
 
         with mock.patch.object(
-            DefaultPlanner, "create_action",
+                DefaultPlanner, "create_action",
-            wraps=default_planner.create_action) as m_create_action:
+                wraps=default_planner.create_action) as m_create_action:
             action_plan = default_planner.schedule(
                 self.context, audit.id, dummy_solution
             )
@@ -83,19 +80,18 @@ class TestActionScheduling(base.DbTestCase):
 
 
 class TestDefaultPlanner(base.DbTestCase):
-
     def setUp(self):
         super(TestDefaultPlanner, self).setUp()
         self.default_planner = DefaultPlanner()
         obj_utils.create_test_audit_template(self.context)
 
-        p = mock.patch.object(db_api.Connection, 'create_action_plan')
+        p = mock.patch.object(db_api.BaseConnection, 'create_action_plan')
         self.mock_create_action_plan = p.start()
         self.mock_create_action_plan.side_effect = (
             self._simulate_action_plan_create)
         self.addCleanup(p.stop)
 
-        q = mock.patch.object(db_api.Connection, 'create_action')
+        q = mock.patch.object(db_api.BaseConnection, 'create_action')
         self.mock_create_action = q.start()
         self.mock_create_action.side_effect = (
             self._simulate_action_create)