From 08d66e2e2b229ebb6764cb821e243f482f2909c5 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Wed, 13 Jul 2016 12:36:48 +0200 Subject: [PATCH] Assert reservation_id in notification sample test Until now the reservation_id of the instance was ignored in the notification sample test, this patch adds the way to assert it properly. Change-Id: Ie287a2cdad9996c75fd22a3e332b83b0c32570b4 --- .../notification_sample_base.py | 9 +++- .../test_instance.py | 45 +++++++------------ 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/nova/tests/functional/notification_sample_tests/notification_sample_base.py b/nova/tests/functional/notification_sample_tests/notification_sample_base.py index 5f4d0b13e842..8415f4c5c5b4 100644 --- a/nova/tests/functional/notification_sample_tests/notification_sample_base.py +++ b/nova/tests/functional/notification_sample_tests/notification_sample_base.py @@ -152,17 +152,24 @@ class NotificationSampleTestBase(test.TestCase, image_uuid='155d900f-4e14-4e4c-a73d-069cbf4541e6', flavor_id=flavor_id) + extra_params['return_reservation_id'] = True + if extra_params: server.update(extra_params) post = {'server': server} created_server = self.api.post_server(post) + reservation_id = created_server['reservation_id'] + created_server = self.api.get_servers( + detail=False, + search_opts={'reservation_id': reservation_id})[0] + self.assertTrue(created_server['id']) # Wait for it to finish being created found_server = self._wait_for_state_change(self.api, created_server, expected_status) - + found_server['reservation_id'] = reservation_id return found_server def _wait_until_deleted(self, server): diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index ac10179230b2..6b565ce2591a 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -37,15 +37,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-delete-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-delete-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -81,8 +79,7 @@ class TestInstanceNotificationSample( self.assertEqual(7, len(instance_updates)) create_steps = [ # nothing -> scheduling - {'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + {'reservation_id': server['reservation_id'], 'uuid': server['id'], 'host': None, 'node': None, @@ -205,15 +202,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-power_on-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-power_on-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -231,15 +226,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-shelve-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-shelve-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -255,15 +248,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-suspend-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-suspend-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -278,15 +269,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-pause-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-pause-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -303,15 +292,13 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-resize-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-resize-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) @@ -328,14 +315,12 @@ class TestInstanceNotificationSample( self._verify_notification( 'instance-restore-start', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[0]) self._verify_notification( 'instance-restore-end', replacements={ - 'reservation_id': - notification_sample_base.NotificationSampleTestBase.ANY, + 'reservation_id': server['reservation_id'], 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1])