openstack/watcher
Code Issues Proposed changes

Merge "[host_maintenance] Pass des hostname in add_action solution"

Browse Source
This commit is contained in:
Zuul
2025-05-02 13:45:57 +00:00
committed by Gerrit Code Review
parent 57b248f9fe 278cb7e98c
commit 9f685a8cf1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/decision_engine/strategy/strategies/host_maintenance.py
View File

@@ -195,7 +195,7 @@ class HostMaintenance(base.HostMaintenanceBaseStrategy):
'source_node': src_node.uuid, 'source_node': src_node.uuid,
'resource_name': instance.name} 'resource_name': instance.name}
if des_node: if des_node:
params['destination_node'] = des_node.uuid params['destination_node'] = des_node.hostname
self.solution.add_action(action_type=self.INSTANCE_MIGRATION, self.solution.add_action(action_type=self.INSTANCE_MIGRATION,
resource_id=instance.uuid, resource_id=instance.uuid,
input_parameters=params) input_parameters=params)

8
watcher/tests/decision_engine/strategy/strategies/test_host_maintenance.py
View File

@@ -111,7 +111,7 @@ class TestHostMaintenance(TestBaseStrategy):
self.strategy.instance_migration(instance_0, node_0, node_1) self.strategy.instance_migration(instance_0, node_0, node_1)
self.assertEqual(1, len(self.strategy.solution.actions)) self.assertEqual(1, len(self.strategy.solution.actions))
expected = [{'action_type': 'migrate', expected = [{'action_type': 'migrate',
'input_parameters': {'destination_node': node_1.uuid, 'input_parameters': {'destination_node': node_1.hostname,
'source_node': node_0.uuid, 'source_node': node_0.uuid,
'migration_type': 'live', 'migration_type': 'live',
'resource_id': instance_0.uuid, 'resource_id': instance_0.uuid,
@@ -144,14 +144,14 @@ class TestHostMaintenance(TestBaseStrategy):
self.strategy.host_migration(node_0, node_1) self.strategy.host_migration(node_0, node_1)
self.assertEqual(2, len(self.strategy.solution.actions)) self.assertEqual(2, len(self.strategy.solution.actions))
expected = [{'action_type': 'migrate', expected = [{'action_type': 'migrate',
'input_parameters': {'destination_node': node_1.uuid, 'input_parameters': {'destination_node': node_1.hostname,
'source_node': node_0.uuid, 'source_node': node_0.uuid,
'migration_type': 'live', 'migration_type': 'live',
'resource_id': instance_0.uuid, 'resource_id': instance_0.uuid,
'resource_name': instance_0.name 'resource_name': instance_0.name
}}, }},
{'action_type': 'migrate', {'action_type': 'migrate',
'input_parameters': {'destination_node': node_1.uuid, 'input_parameters': {'destination_node': node_1.hostname,
'source_node': node_0.uuid, 'source_node': node_0.uuid,
'migration_type': 'live', 'migration_type': 'live',
'resource_id': instance_1.uuid, 'resource_id': instance_1.uuid,
@@ -213,7 +213,7 @@ class TestHostMaintenance(TestBaseStrategy):
'disabled_reason': 'watcher_maintaining'}}, 'disabled_reason': 'watcher_maintaining'}},
{'action_type': 'migrate', {'action_type': 'migrate',
'input_parameters': { 'input_parameters': {
'destination_node': node_3.uuid, 'destination_node': node_3.hostname,
'source_node': node_2.uuid, 'source_node': node_2.uuid,
'migration_type': 'live', 'migration_type': 'live',
'resource_id': instance_4.uuid, 'resource_id': instance_4.uuid,