From 9918f5922758b99b88d33b80688b8b842444ac41 Mon Sep 17 00:00:00 2001
From: Tin Lam <tl3438@att.com>
Date: Tue, 21 Jun 2016 23:25:09 -0500
Subject: [PATCH] Centralize plugin loaders in decision engine

Refactor planner loader in watcher/decision_engine/planner/loading/default.py
to watcher/decision_engine/loading/default.py.

Change-Id: I3d4f3668d2269b5a77a35f4470a4d1c96c3128dd
Closes-Bug: #1591092
---
 watcher/decision_engine/loading/default.py    |  6 +++++
 .../planner/loading/__init__.py               |  0
 .../planner/loading/default.py                | 26 -------------------
 watcher/decision_engine/planner/manager.py    |  2 +-
 watcher/opts.py                               |  7 +++--
 .../planner/test_default_planner_loader.py    |  2 +-
 6 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 watcher/decision_engine/planner/loading/__init__.py
 delete mode 100644 watcher/decision_engine/planner/loading/default.py

diff --git a/watcher/decision_engine/loading/default.py b/watcher/decision_engine/loading/default.py
index f7f29ca55..427e7bdf5 100644
--- a/watcher/decision_engine/loading/default.py
+++ b/watcher/decision_engine/loading/default.py
@@ -33,3 +33,9 @@ class DefaultGoalLoader(default.DefaultLoader):
     def __init__(self):
         super(DefaultGoalLoader, self).__init__(
             namespace='watcher_goals')
+
+
+class DefaultPlannerLoader(default.DefaultLoader):
+    def __init__(self):
+        super(DefaultPlannerLoader, self).__init__(
+            namespace='watcher_planners')
diff --git a/watcher/decision_engine/planner/loading/__init__.py b/watcher/decision_engine/planner/loading/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/watcher/decision_engine/planner/loading/default.py b/watcher/decision_engine/planner/loading/default.py
deleted file mode 100644
index 3c4738a6a..000000000
--- a/watcher/decision_engine/planner/loading/default.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2015 b<>com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from __future__ import unicode_literals
-
-from watcher.common.loader import default
-
-
-class DefaultPlannerLoader(default.DefaultLoader):
-    def __init__(self):
-        super(DefaultPlannerLoader, self).__init__(
-            namespace='watcher_planners')
diff --git a/watcher/decision_engine/planner/manager.py b/watcher/decision_engine/planner/manager.py
index c7946f35e..8cda270ab 100644
--- a/watcher/decision_engine/planner/manager.py
+++ b/watcher/decision_engine/planner/manager.py
@@ -18,7 +18,7 @@
 from oslo_config import cfg
 from oslo_log import log
 
-from watcher.decision_engine.planner.loading import default as loader
+from watcher.decision_engine.loading import default as loader
 
 
 LOG = log.getLogger(__name__)
diff --git a/watcher/opts.py b/watcher/opts.py
index 37df1f3d4..f747cea22 100644
--- a/watcher/opts.py
+++ b/watcher/opts.py
@@ -25,16 +25,15 @@ from watcher.applier.workflow_engine.loading import default as \
     workflow_engine_loader
 from watcher.common import clients
 from watcher.common import utils
-from watcher.decision_engine.loading import default as strategy_loader
+from watcher.decision_engine.loading import default as decision_engine_loader
 from watcher.decision_engine import manager as decision_engine_manger
-from watcher.decision_engine.planner.loading import default as planner_loader
 from watcher.decision_engine.planner import manager as planner_manager
 
 
 PLUGIN_LOADERS = (
     action_loader.DefaultActionLoader,
-    planner_loader.DefaultPlannerLoader,
-    strategy_loader.DefaultStrategyLoader,
+    decision_engine_loader.DefaultPlannerLoader,
+    decision_engine_loader.DefaultStrategyLoader,
     workflow_engine_loader.DefaultWorkFlowEngineLoader,
 )
 
diff --git a/watcher/tests/decision_engine/planner/test_default_planner_loader.py b/watcher/tests/decision_engine/planner/test_default_planner_loader.py
index 1b9e9bd3c..0354da919 100644
--- a/watcher/tests/decision_engine/planner/test_default_planner_loader.py
+++ b/watcher/tests/decision_engine/planner/test_default_planner_loader.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from watcher.decision_engine.loading import default
 from watcher.decision_engine.planner import base as planner
-from watcher.decision_engine.planner.loading import default
 from watcher.tests import base