Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Meta-Action to Action

Browse Source 
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 Meta-Action to Action

Partially implements: blueprint glossary-related-refactoring

Change-Id: Ie67b800332179be93718030ddd7a36ddc76a544c
This commit is contained in:
Jean-Emile DARTOIS
2015-12-04 18:13:03 +01:00
parent 5e8c1af665
commit 087c4d49ed
19 changed files with 137 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
watcher/decision_engine/strategy/basic_consolidation.py
View File

@@ -17,21 +17,19 @@
# limitations under the License.
#
from oslo_log import log
from watcher.common.exception import ClusterEmpty
from watcher.common.exception import ClusteStateNotDefined
from watcher.decision_engine.strategy.base import BaseStrategy
from watcher.decision_engine.strategy.level import StrategyLevel
from watcher.decision_engine.meta_action.hypervisor_state import \
from watcher.decision_engine.actions.hypervisor_state import \
ChangeHypervisorState
from watcher.decision_engine.meta_action.migrate import Migrate
from watcher.decision_engine.meta_action.migrate import MigrationType
from watcher.decision_engine.meta_action.power_state import ChangePowerState
from watcher.decision_engine.meta_action.power_state import PowerState
from watcher.decision_engine.actions.migration import Migrate
from watcher.decision_engine.actions.migration import MigrationType
from watcher.decision_engine.actions.power_state import ChangePowerState
from watcher.decision_engine.model.hypervisor_state import HypervisorState
from watcher.decision_engine.model.power_state import PowerState
from watcher.decision_engine.model.resource import ResourceType
from watcher.decision_engine.model.vm_state import VMState
from watcher.decision_engine.strategy.base import BaseStrategy
from watcher.decision_engine.strategy.level import StrategyLevel
from watcher.metrics_engine.cluster_history.ceilometer import \
CeilometerClusterHistory
@@ -39,7 +37,6 @@ LOG = log.getLogger(__name__)
class BasicConsolidation(BaseStrategy):
DEFAULT_NAME = "basic"
DEFAULT_DESCRIPTION = "Basic offline consolidation"
@@ -447,8 +444,8 @@ class BasicConsolidation(BaseStrategy):
mig_src_hypervisor,
mig_dst_hypervisor)
# live migration
live_migrate.set_migration_type(
MigrationType.pre_copy)
live_migrate.migration_type = \
MigrationType.pre_copy
live_migrate.level = StrategyLevel.conservative
tmp_vm_migration_schedule.append(live_migrate)

2
watcher/decision_engine/strategy/dummy_strategy.py
View File

@@ -18,7 +18,7 @@
#
from oslo_log import log
from watcher.decision_engine.meta_action.nop import Nop
from watcher.decision_engine.actions.nop import Nop
from watcher.decision_engine.strategy.base import BaseStrategy
LOG = log.getLogger(__name__)