openstack/nova
Code Issues Proposed changes

Transform instance.live_migration_rollback_dest notification

Browse Source 
The instance.live_migration_rollback_dest.start and
instance.live_migration_rollback_dest.end notifications has been
transformed to the versioned notification framework.

Co-Authored-By: Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
Change-Id: I8129cbd1785133d4cc1b70bbba6bd7fcc1d21f4a
Implements: bp versioned-notification-transformation-rocky
This commit is contained in:
Gábor Antal
2017-07-04 16:39:01 +02:00
committed by Takashi NATSUME
parent e019be3724
commit 8ddbe07e8f
7 changed files with 74 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nova/tests/functional/notification_sample_tests/test_instance.py
View File

@@ -65,9 +65,12 @@ class TestInstanceNotificationSampleWithMultipleCompute(
# Ensure that instance is in active state after an action
self._wait_for_state_change(self.admin_api, server, 'ACTIVE')
@mock.patch('nova.compute.manager.ComputeManager.'
'_live_migration_cleanup_flags', return_value=[True, False])
@mock.patch('nova.compute.rpcapi.ComputeAPI.pre_live_migration',
side_effect=exception.DestinationDiskExists(path='path'))
def _test_live_migration_rollback(self, server, mock_migration):
def _test_live_migration_rollback(self, server, mock_migration,
mock_flags):
post = {
'os-migrateLive': {
'host': 'host2',
@@ -76,10 +79,14 @@ class TestInstanceNotificationSampleWithMultipleCompute(
}
}
self.admin_api.post_server_action(server['id'], post)
self._wait_for_notification('instance.live_migration_rollback.start')
self._wait_for_notification('instance.live_migration_rollback.end')
self._wait_for_notification(
'instance.live_migration_rollback_dest.end')
self.assertEqual(2, len(fake_notifier.VERSIONED_NOTIFICATIONS))
# 0. instance.live_migration_rollback.start
# 1. instance.live_migration_rollback.end
# 2. instance.live_migration_rollback_dest.start
# 3. instance.live_migration_rollback_dest.end
self.assertEqual(4, len(fake_notifier.VERSIONED_NOTIFICATIONS))
self._verify_notification(
'instance-live_migration_rollback-start',
replacements={
@@ -92,6 +99,18 @@ class TestInstanceNotificationSampleWithMultipleCompute(
'reservation_id': server['reservation_id'],
'uuid': server['id']},
actual=fake_notifier.VERSIONED_NOTIFICATIONS[1])
self._verify_notification(
'instance-live_migration_rollback_dest-start',
replacements={
'reservation_id': server['reservation_id'],
'uuid': server['id']},
actual=fake_notifier.VERSIONED_NOTIFICATIONS[2])
self._verify_notification(
'instance-live_migration_rollback_dest-end',
replacements={
'reservation_id': server['reservation_id'],
'uuid': server['id']},
actual=fake_notifier.VERSIONED_NOTIFICATIONS[3])
def _test_live_migration_pre_and_post_dest(self, server):
post = {