Merge "Use base_strategy's add_action_migrate method"
This commit is contained in:
commit
b45777c497
@ -76,8 +76,6 @@ class UniformAirflow(base.BaseStrategy):
|
||||
host_power='hardware.ipmi.node.power'),
|
||||
)
|
||||
|
||||
MIGRATION = "migrate"
|
||||
|
||||
def __init__(self, config, osc=None):
|
||||
"""Using live migration
|
||||
|
||||
@ -340,12 +338,11 @@ class UniformAirflow(base.BaseStrategy):
|
||||
destination_node = info['node']
|
||||
if self.compute_model.migrate_instance(
|
||||
instance, source_node, destination_node):
|
||||
parameters = {'migration_type': 'live',
|
||||
'source_node': source_node.uuid,
|
||||
'destination_node': destination_node.uuid}
|
||||
self.solution.add_action(action_type=self.MIGRATION,
|
||||
resource_id=instance.uuid,
|
||||
input_parameters=parameters)
|
||||
self.add_action_migrate(
|
||||
instance,
|
||||
'live',
|
||||
source_node,
|
||||
destination_node)
|
||||
|
||||
def post_execute(self):
|
||||
self.solution.model = self.compute_model
|
||||
|
@ -239,12 +239,11 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
|
||||
|
||||
if self.compute_model.migrate_instance(
|
||||
instance, source_node, destination_node):
|
||||
params = {'migration_type': migration_type,
|
||||
'source_node': source_node.uuid,
|
||||
'destination_node': destination_node.uuid}
|
||||
self.solution.add_action(action_type=self.MIGRATION,
|
||||
resource_id=instance.uuid,
|
||||
input_parameters=params)
|
||||
self.add_action_migrate(
|
||||
instance,
|
||||
migration_type,
|
||||
source_node,
|
||||
destination_node)
|
||||
self.number_of_migrations += 1
|
||||
|
||||
def disable_unused_nodes(self):
|
||||
|
@ -67,8 +67,6 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
|
||||
|
||||
DATASOURCE_METRICS = ['instance_cpu_usage', 'instance_ram_usage']
|
||||
|
||||
MIGRATION = "migrate"
|
||||
|
||||
def __init__(self, config, osc=None):
|
||||
"""Workload balance using live migration
|
||||
|
||||
@ -346,12 +344,11 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
|
||||
# generate solution to migrate the instance to the dest server,
|
||||
if self.compute_model.migrate_instance(
|
||||
instance_src, source_node, mig_destination_node):
|
||||
parameters = {'migration_type': 'live',
|
||||
'source_node': source_node.uuid,
|
||||
'destination_node': mig_destination_node.uuid}
|
||||
self.solution.add_action(action_type=self.MIGRATION,
|
||||
resource_id=instance_src.uuid,
|
||||
input_parameters=parameters)
|
||||
self.add_action_migrate(
|
||||
instance_src,
|
||||
'live',
|
||||
source_node,
|
||||
mig_destination_node)
|
||||
self.instance_migrations_count += 1
|
||||
|
||||
def post_execute(self):
|
||||
|
Loading…
Reference in New Issue
Block a user