Rename Mapper to Mapping
Some Python class and packages need to be renamed for a better compliance with the shared terminology which provides a better understanding of Watcher objects and components by every contributor. This patchset is there to change mapper to mapping Partially implements: blueprint glossary-related-refactoring Change-Id: Ieaca42431322ce40d87de147ac0b46a1f446f390
This commit is contained in:
@@ -17,10 +17,8 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
from oslo_log import log
|
||||
|
||||
from watcher.applier.mapper.default import DefaultActionMapper
|
||||
|
||||
from watcher.applier.execution.deploy_phase import DeployPhase
|
||||
from watcher.applier.mapping.default import DefaultActionMapper
|
||||
from watcher.applier.messaging.events import Events
|
||||
from watcher.common.messaging.events.event import Event
|
||||
from watcher.objects import Action
|
||||
|
||||
@@ -16,15 +16,12 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
|
||||
from watcher.applier.mapper.base import BaseActionMapper
|
||||
from watcher.applier.mapping.base import BaseActionMapper
|
||||
from watcher.applier.primitives.change_nova_service_state import \
|
||||
ChangeNovaServiceState
|
||||
from watcher.applier.primitives.migration import Migrate
|
||||
from watcher.applier.primitives.nop import Nop
|
||||
from watcher.applier.primitives.power_state import ChangePowerState
|
||||
|
||||
from watcher.common.exception import ActionNotFound
|
||||
from watcher.decision_engine.planner.default import Primitives
|
||||
|
||||
@@ -17,14 +17,15 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
import mock
|
||||
from watcher.applier.mapper.default import DefaultActionMapper
|
||||
|
||||
from watcher.applier.mapping.default import DefaultActionMapper
|
||||
from watcher.decision_engine.planner.default import Primitives
|
||||
from watcher.tests import base
|
||||
|
||||
|
||||
class TestCommandMapper(base.TestCase):
|
||||
class TestDefaultActionMapper(base.TestCase):
|
||||
def setUp(self):
|
||||
super(TestCommandMapper, self).setUp()
|
||||
super(TestDefaultActionMapper, self).setUp()
|
||||
self.mapper = DefaultActionMapper()
|
||||
|
||||
def test_build_command_cold(self):
|
||||
59
watcher/tests/applier/mapping/test_default_action_mapper.py
Normal file
59
watcher/tests/applier/mapping/test_default_action_mapper.py
Normal file
@@ -0,0 +1,59 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
# Copyright (c) 2015 b<>com
|
||||
#
|
||||
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.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.
|
||||
#
|
||||
import mock
|
||||
|
||||
from watcher.applier.mapping.default import DefaultActionMapper
|
||||
from watcher.decision_engine.planner.default import Primitives
|
||||
from watcher.tests import base
|
||||
|
||||
|
||||
class TestDefaultActionMapper(base.TestCase):
|
||||
def setUp(self):
|
||||
super(TestDefaultActionMapper, self).setUp()
|
||||
self.mapper = DefaultActionMapper()
|
||||
|
||||
def test_build_command_cold(self):
|
||||
action = mock.MagicMock()
|
||||
action.action_type = Primitives.COLD_MIGRATE.value
|
||||
cmd = self.mapper.build_primitive_from_action(action)
|
||||
self.assertIsNotNone(cmd)
|
||||
|
||||
def test_build_command_live(self):
|
||||
action = mock.MagicMock()
|
||||
action.action_type = Primitives.LIVE_MIGRATE.value
|
||||
cmd = self.mapper.build_primitive_from_action(action)
|
||||
self.assertIsNotNone(cmd)
|
||||
|
||||
def test_build_command_h_s(self):
|
||||
action = mock.MagicMock()
|
||||
action.action_type = Primitives.HYPERVISOR_STATE.value
|
||||
cmd = self.mapper.build_primitive_from_action(action)
|
||||
self.assertIsNotNone(cmd)
|
||||
|
||||
def test_build_command_p_s(self):
|
||||
action = mock.MagicMock()
|
||||
action.action_type = Primitives.POWER_STATE.value
|
||||
cmd = self.mapper.build_primitive_from_action(action)
|
||||
self.assertIsNotNone(cmd)
|
||||
|
||||
def test_build_command_exception_attribute(self):
|
||||
action = mock.MagicMock
|
||||
self.assertRaises(AttributeError,
|
||||
self.mapper.build_primitive_from_action,
|
||||
action)
|
||||
Reference in New Issue
Block a user