From 85d20dfa482d61701c8239b9fd608e516c1f44df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Thu, 30 Mar 2017 13:50:36 +0200 Subject: [PATCH] Move rebuild notification tests into separate method The current rebuild testing in test_instance_action changes the image used by the instance, therefore the actions tested in test_instance_action had to be in specific order as testing rebuild also changes the output json. The rebuild test was moved from test_instance_action to its own method, and now all the actions in test_instance_actions keeps the instance in the same state. Change-Id: Id0a7aaf8575d69deb89d3842b54fc23ee05b2153 Implements: bp versioned-notification-transformation-pike --- doc/notification_samples/instance-reboot-end.json | 4 ++-- doc/notification_samples/instance-reboot-error.json | 4 ++-- doc/notification_samples/instance-reboot-start.json | 4 ++-- .../instance-volume_attach-end.json | 4 ++-- .../instance-volume_attach-error.json | 4 ++-- .../instance-volume_attach-start.json | 4 ++-- .../instance-volume_detach-end.json | 4 ++-- .../instance-volume_detach-start.json | 4 ++-- .../notification_sample_tests/test_instance.py | 13 +++++++++++-- 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/doc/notification_samples/instance-reboot-end.json b/doc/notification_samples/instance-reboot-end.json index f2700dbe02..03b2004913 100644 --- a/doc/notification_samples/instance-reboot-end.json +++ b/doc/notification_samples/instance-reboot-end.json @@ -2,7 +2,7 @@ "event_type":"instance.reboot.end", "payload":{ "nova_object.data":{ - "architecture":null, + "architecture": "x86_64", "availability_zone": "nova", "created_at":"2012-10-29T13:42:11Z", "deleted_at":null, @@ -28,7 +28,7 @@ "auto_disk_config":"MANUAL", "kernel_id":"", "launched_at":"2012-10-29T13:42:11Z", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "metadata":{}, "locked":false, "node":"fake-mini", diff --git a/doc/notification_samples/instance-reboot-error.json b/doc/notification_samples/instance-reboot-error.json index c54a440c96..bdeb6095f4 100644 --- a/doc/notification_samples/instance-reboot-error.json +++ b/doc/notification_samples/instance-reboot-error.json @@ -2,7 +2,7 @@ "event_type":"instance.reboot.error", "payload":{ "nova_object.data":{ - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at":"2012-10-29T13:42:11Z", "deleted_at":null, @@ -38,7 +38,7 @@ "auto_disk_config":"MANUAL", "kernel_id":"", "launched_at":"2012-10-29T13:42:11Z", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "metadata":{}, "locked":false, "node":"fake-mini", diff --git a/doc/notification_samples/instance-reboot-start.json b/doc/notification_samples/instance-reboot-start.json index 16538f17d0..ecfac7cda4 100644 --- a/doc/notification_samples/instance-reboot-start.json +++ b/doc/notification_samples/instance-reboot-start.json @@ -2,7 +2,7 @@ "event_type":"instance.reboot.start", "payload":{ "nova_object.data":{ - "architecture":null, + "architecture": "x86_64", "availability_zone": "nova", "created_at":"2012-10-29T13:42:11Z", "deleted_at":null, @@ -28,7 +28,7 @@ "auto_disk_config":"MANUAL", "kernel_id":"", "launched_at":"2012-10-29T13:42:11Z", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "metadata":{}, "locked":false, "node":"fake-mini", diff --git a/doc/notification_samples/instance-volume_attach-end.json b/doc/notification_samples/instance-volume_attach-end.json index a8161b2930..26d01f4d7d 100644 --- a/doc/notification_samples/instance-volume_attach-end.json +++ b/doc/notification_samples/instance-volume_attach-end.json @@ -2,7 +2,7 @@ "event_type": "instance.volume_attach.end", "payload": { "nova_object.data": { - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at": "2012-10-29T13:42:11Z", "deleted_at": null, @@ -33,7 +33,7 @@ }, "host": "compute", "host_name": "some-server", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "ip_addresses": [{ "nova_object.data": { "address": "192.168.1.3", diff --git a/doc/notification_samples/instance-volume_attach-error.json b/doc/notification_samples/instance-volume_attach-error.json index 425674a849..fa52c20445 100644 --- a/doc/notification_samples/instance-volume_attach-error.json +++ b/doc/notification_samples/instance-volume_attach-error.json @@ -2,7 +2,7 @@ "event_type": "instance.volume_attach.error", "payload": { "nova_object.data": { - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at": "2012-10-29T13:42:11Z", "deleted_at": null, @@ -43,7 +43,7 @@ }, "host": "compute", "host_name": "some-server", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "ip_addresses": [{ "nova_object.data": { "address": "192.168.1.3", diff --git a/doc/notification_samples/instance-volume_attach-start.json b/doc/notification_samples/instance-volume_attach-start.json index e0fa8cac59..2f68f06840 100644 --- a/doc/notification_samples/instance-volume_attach-start.json +++ b/doc/notification_samples/instance-volume_attach-start.json @@ -2,7 +2,7 @@ "event_type": "instance.volume_attach.start", "payload": { "nova_object.data": { - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at": "2012-10-29T13:42:11Z", "deleted_at": null, @@ -33,7 +33,7 @@ }, "host": "compute", "host_name": "some-server", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "ip_addresses": [{ "nova_object.data": { "address": "192.168.1.3", diff --git a/doc/notification_samples/instance-volume_detach-end.json b/doc/notification_samples/instance-volume_detach-end.json index f06ff24d79..37b5e465d1 100644 --- a/doc/notification_samples/instance-volume_detach-end.json +++ b/doc/notification_samples/instance-volume_detach-end.json @@ -2,7 +2,7 @@ "event_type": "instance.volume_detach.end", "payload": { "nova_object.data": { - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at": "2012-10-29T13:42:11Z", "deleted_at": null, @@ -33,7 +33,7 @@ }, "host": "compute", "host_name": "some-server", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "ip_addresses": [{ "nova_object.data": { "address": "192.168.1.3", diff --git a/doc/notification_samples/instance-volume_detach-start.json b/doc/notification_samples/instance-volume_detach-start.json index ab2d263b75..798975646d 100644 --- a/doc/notification_samples/instance-volume_detach-start.json +++ b/doc/notification_samples/instance-volume_detach-start.json @@ -2,7 +2,7 @@ "event_type": "instance.volume_detach.start", "payload": { "nova_object.data": { - "architecture": null, + "architecture": "x86_64", "availability_zone": "nova", "created_at": "2012-10-29T13:42:11Z", "deleted_at": null, @@ -33,7 +33,7 @@ }, "host": "compute", "host_name": "some-server", - "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", + "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", "ip_addresses": [{ "nova_object.data": { "address": "192.168.1.3", diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index 38037d4f3a..c8dca3cdc9 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -75,7 +75,6 @@ class TestInstanceNotificationSample( self._test_revert_server, self._test_resize_confirm_server, self._test_snapshot_server, - self._test_rebuild_server, self._test_reboot_server, self._test_reboot_server_error, self._test_trigger_crash_dump, @@ -560,7 +559,17 @@ class TestInstanceNotificationSample( 'uuid': server['id']}, actual=fake_notifier.VERSIONED_NOTIFICATIONS[1]) - def _test_rebuild_server(self, server): + def test_rebuild_server(self): + # NOTE(gabor_antal): Rebuild changes the image used by the instance, + # therefore the actions tested in test_instance_action had to be in + # specific order. To avoid this problem, rebuild was moved from + # test_instance_action to its own method. + + server = self._boot_a_server( + extra_params={'networks': [{'port': self.neutron.port_1['id']}]}) + + fake_notifier.reset() + post = { 'rebuild': { 'imageRef': 'a2459075-d96c-40d5-893e-577ff92e721c',