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

Put the method add_migration() in base.py

Browse Source 
Change-Id: I00bc03be6a59edf117b66388305486d8f74f77ce
This commit is contained in:
chenke
2019-04-25 19:20:31 +08:00
parent 92c94f61ca
commit 4d480d5ccf
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
watcher/decision_engine/strategy/strategies/basic_consolidation.py
View File

@@ -65,7 +65,6 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy):
instance_cpu_usage='cpu_util'),
)
MIGRATION = "migrate"
CHANGE_NOVA_SERVICE_STATE = "change_nova_service_state"
def __init__(self, config, osc=None):
@@ -341,18 +340,6 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy):
resource_id=resource_id,
input_parameters=parameters)
def add_migration(self,
resource_id,
migration_type,
source_node,
destination_node):
parameters = {'migration_type': migration_type,
'source_node': source_node,
'destination_node': destination_node}
self.solution.add_action(action_type=self.MIGRATION,
resource_id=resource_id,
input_parameters=parameters)
def compute_score_of_nodes(self):
"""Calculate score of nodes based on load by VMs"""
score = []
@@ -387,9 +374,9 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy):
"""Create migration VM"""
if self.compute_model.migrate_instance(
mig_instance, mig_source_node, mig_destination_node):
self.add_migration(mig_instance.uuid, 'live',
mig_source_node.uuid,
mig_destination_node.uuid)
self.add_action_migrate(mig_instance, 'live',
mig_source_node,
mig_destination_node)
if len(self.compute_model.get_node_instances(mig_source_node)) == 0:
self.add_action_disable_node(mig_source_node.uuid)