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

Merge "Function call pass parameter error"

Browse Source
This commit is contained in:
Jenkins
2016-12-16 08:47:55 +00:00
committed by Gerrit Code Review
parent 695ddf8ae7 d792e3cfae
commit 345083e090
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
View File

@@ -401,13 +401,16 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
'input_parameters'][
'resource_id'] == instance_uuid)
if len(actions) > 1:
src = actions[0]['input_parameters']['source_node']
dst = actions[-1]['input_parameters']['destination_node']
src_uuid = actions[0]['input_parameters']['source_node']
dst_uuid = actions[-1]['input_parameters']['destination_node']
for a in actions:
self.solution.actions.remove(a)
self.number_of_migrations -= 1
if src != dst:
self.add_migration(instance_uuid, src, dst, model)
if src_uuid != dst_uuid:
src_node = model.get_node_by_uuid(src_uuid)
dst_node = model.get_node_by_uuid(dst_uuid)
self.add_migration(
instance_uuid, src_node, dst_node, model)
def offload_phase(self, model, cc):
"""Perform offloading phase.