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