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

Merge "Update migration notification" into stable/stein

Browse Source
This commit is contained in:
Zuul
2019-05-29 07:49:55 +00:00
committed by Gerrit Code Review
parent 59be8928d0 7fafedbb43
commit dbeca934f5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/decision_engine/model/notification/nova.py
View File

@@ -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,

2
watcher/tests/decision_engine/model/notification/data/instance-live_migration_post_dest-end.json → watcher/tests/decision_engine/model/notification/data/instance-live_migration_post-end.json
View File

@@ -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",

6
watcher/tests/decision_engine/model/notification/test_nova_notifications.py
View File

@@ -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'],