From 6d965121880f7d581d5773faa9d6c9c6eb65ce65 Mon Sep 17 00:00:00 2001 From: licanwei Date: Tue, 14 May 2019 15:10:46 +0800 Subject: [PATCH] Update migration notification _post_live_migration[1] runs on the source host and calls post_live_migration_at_destination on the dest host which emits the instance.live_migration_post_dest.end notification:[2] But it's not the last notification for the live migration operation. so we should use instance.live_migration_post.end instead of instance.live_migration_post_dest.end notification. [1]https://github.com/openstack/nova/blob/daa2ac2287df12dfdee532d66ef97a03350ca6af/nova/compute/manager.py#L6907 [2]https://github.com/openstack/nova/blob/daa2ac2287df12dfdee532d66ef97a03350ca6af/nova/compute/manager.py#L7035 Change-Id: Id1e2d98f56d5a95d49e32f98d2910660b9f48ce6 --- watcher/decision_engine/model/notification/nova.py | 2 +- ..._dest-end.json => instance-live_migration_post-end.json} | 2 +- .../model/notification/test_nova_notifications.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename watcher/tests/decision_engine/model/notification/data/{instance-live_migration_post_dest-end.json => instance-live_migration_post-end.json} (98%) diff --git a/watcher/decision_engine/model/notification/nova.py b/watcher/decision_engine/model/notification/nova.py index 48b6ac454..763328a59 100644 --- a/watcher/decision_engine/model/notification/nova.py +++ b/watcher/decision_engine/model/notification/nova.py @@ -256,7 +256,7 @@ class VersionedNotification(NovaNotification): 'instance.rescue.end': instance_updated, 'instance.update': instance_updated, 'instance.live_migration_force_complete.end': instance_updated, - 'instance.live_migration_post_dest.end': instance_updated, + 'instance.live_migration_post.end': instance_updated, 'instance.delete.end': instance_deleted, 'instance.soft_delete.end': instance_deleted, 'service.create': service_updated, diff --git a/watcher/tests/decision_engine/model/notification/data/instance-live_migration_post_dest-end.json b/watcher/tests/decision_engine/model/notification/data/instance-live_migration_post-end.json similarity index 98% rename from watcher/tests/decision_engine/model/notification/data/instance-live_migration_post_dest-end.json rename to watcher/tests/decision_engine/model/notification/data/instance-live_migration_post-end.json index ea49d379a..faf527807 100644 --- a/watcher/tests/decision_engine/model/notification/data/instance-live_migration_post_dest-end.json +++ b/watcher/tests/decision_engine/model/notification/data/instance-live_migration_post-end.json @@ -1,5 +1,5 @@ { - "event_type": "instance.live_migration_post_dest.end", + "event_type": "instance.live_migration_post.end", "payload": { "nova_object.data": { "action_initiator_project": "6f70656e737461636b20342065766572", diff --git a/watcher/tests/decision_engine/model/notification/test_nova_notifications.py b/watcher/tests/decision_engine/model/notification/test_nova_notifications.py index c74364e3e..e23bd8ee5 100644 --- a/watcher/tests/decision_engine/model/notification/test_nova_notifications.py +++ b/watcher/tests/decision_engine/model/notification/test_nova_notifications.py @@ -69,8 +69,8 @@ class TestReceiveNovaNotifications(NotificationTestCase): 'instance.update': 'instance-update.json', 'instance.live_migration_force_complete.end': 'instance-live_migration_force_complete-end.json', - 'instance.live_migration_post_dest.end': - 'instance-live_migration_post_dest-end.json', + 'instance.live_migration_post.end': + 'instance-live_migration_post-end.json', 'instance.delete.end': 'instance-delete-end.json', 'instance.soft_delete.end': 'instance-soft_delete-end.json', 'service.create': 'service-create.json', @@ -437,7 +437,7 @@ class TestNovaNotifications(NotificationTestCase): node = compute_model.get_node_by_instance_uuid(instance0_uuid) self.assertEqual('Node_0', node.uuid) message = self.load_message( - 'instance-live_migration_post_dest-end.json') + 'instance-live_migration_post-end.json') handler.info( ctxt=self.context, publisher_id=message['publisher_id'],