Code refactoring - Watcher Applier package

This patchset is there to change the code structure.
The objective is to flatten the project file tree by merging
'api/' and 'framework/' into a single package. This also contains
some tidy ups in package naming (like using only singular nouns).

This should only affect file/folder names and their subsequent
import paths wherever they were used.

Change-Id: Id7b37667c613086d8ef3cd1f367c4219bf026fc7

watcher/tests/api/v1/test_actions_plans.py

@@ -17,7 +17,7 @@ from oslo_utils import timeutils
 from wsme import types as wtypes
 
 from watcher.api.controllers.v1 import action_plan as api_action_plan
-from watcher.applier.framework import rpcapi as aapi
+from watcher.applier import rpcapi as aapi
 from watcher.common import utils
 from watcher.db import api as db_api
 from watcher import objects

watcher/tests/applier/execution/test_command_executor.py

@@ -18,7 +18,7 @@
 #
 import mock
 
-from watcher.applier.framework.command_executor import CommandExecutor
+from watcher.applier.execution.executor import CommandExecutor
 from watcher import objects
 
 from watcher.common import utils

watcher/tests/applier/mapper/test_command_mapper.py

@@ -17,8 +17,7 @@
 # limitations under the License.
 #
 import mock
-from watcher.applier.framework.default_command_mapper import \
-    DefaultCommandMapper
+from watcher.applier.mapper.default import DefaultCommandMapper
 from watcher.decision_engine.planner.default import Primitives
 from watcher.tests import base
 

watcher/tests/applier/messaging/test_launch_action_plan_command.py

@@ -20,9 +20,8 @@ from mock import call
 from mock import MagicMock
 
 
-from watcher.applier.framework.messaging.events import Events
-from watcher.applier.framework.messaging.launch_action_plan import \
-    LaunchActionPlanCommand
+from watcher.applier.messaging.events import Events
+from watcher.applier.messaging.launcher import LaunchActionPlanCommand
 
 from watcher.objects.action_plan import Status
 from watcher.objects import ActionPlan

watcher/tests/applier/messaging/test_launch_action_plan_endpoint.py

@@ -19,8 +19,7 @@
 
 
 from mock import MagicMock
-from watcher.applier.framework.messaging.trigger_action_plan import \
-    TriggerActionPlan
+from watcher.applier.messaging.trigger import TriggerActionPlan
 from watcher.common import utils
 from watcher.tests import base
 

watcher/tests/applier/primitive/wrapper/test_nova_wrapper.py

@@ -18,7 +18,7 @@
 #
 import mock
 import time
-from watcher.applier.framework.command.wrapper.nova_wrapper import NovaWrapper
+from watcher.applier.primitive.wrapper.nova_wrapper import NovaWrapper
 from watcher.common import utils
 from watcher.tests import base
 

watcher/tests/applier/test_applier_manager.py

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.applier.framework.manager_applier import ApplierManager
+from watcher.applier.manager import ApplierManager
 from watcher.common.messaging.events.event import Event
 from watcher.tests import base
 

watcher/tests/applier/test_rpcapi.py

@@ -19,7 +19,7 @@
 
 import mock
 import oslo_messaging as om
-from watcher.applier.framework.rpcapi import ApplierAPI
+from watcher.applier.rpcapi import ApplierAPI
 
 from watcher.common import exception
 from watcher.common import utils

watcher/tests/cmd/test_applier.py

@@ -21,7 +21,7 @@ import types
 
 from mock import patch
 from oslo_config import cfg
-from watcher.applier.framework.manager_applier import ApplierManager
+from watcher.applier.manager import ApplierManager
 from watcher.cmd import applier
 from watcher.tests.base import BaseTestCase