Transform instance.shelve_offload notifications

Instance.shelve_offload.start and instance.shelve_offload.end notifications
are transformed to the new versioned framework.

Change-Id: Ifccb61527854cdc1a4ceef34059710b5fd802ff9
Implements: bp versioned-notification-transformation-ocata

diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json
new file mode 100644 (file)
index 0000000..9199d68
--- /dev/null
+++ b/doc/notification_samples/instance-shelve_offload-end.json
@@ -0,0 +1,62 @@
+{\r
+    "event_type":"instance.shelve_offload.end",\r
+    "payload":{\r
+        "nova_object.data":{\r
+            "architecture":"x86_64",\r
+            "availability_zone":null,\r
+            "created_at":"2012-10-29T13:42:11Z",\r
+            "deleted_at":null,\r
+            "display_name":"some-server",\r
+            "fault":null,\r
+            "host":null,
+            "host_name":"some-server",\r
+            "ip_addresses": [{\r
+                "nova_object.name": "IpPayload",\r
+                "nova_object.namespace": "nova",\r
+                "nova_object.version": "1.0",\r
+                "nova_object.data": {\r
+                    "mac": "fa:16:3e:4c:2c:30",\r
+                    "address": "192.168.1.3",\r
+                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",\r
+                    "meta": {},\r
+                    "version": 4,\r
+                    "label": "private-network",\r
+                    "device_name": "tapce531f90-19"\r
+                }\r
+            }],\r
+            "kernel_id":"",\r
+            "launched_at":"2012-10-29T13:42:11Z",\r
+            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",\r
+            "metadata":{},\r
+            "node":null,
+            "os_type":null,\r
+            "progress":0,\r
+            "ramdisk_id":"",\r
+            "reservation_id":"r-npxv0e40",\r
+            "state":"shelved_offloaded",\r
+            "task_state":null,\r
+            "power_state":"running",\r
+            "tenant_id":"6f70656e737461636b20342065766572",\r
+            "terminated_at":null,\r
+            "flavor": {\r
+                "nova_object.name": "FlavorPayload",\r
+                "nova_object.data": {\r
+                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",\r
+                    "root_gb": 1,\r
+                    "vcpus": 1,\r
+                    "ephemeral_gb": 0,\r
+                    "memory_mb": 512\r
+                },\r
+                "nova_object.version": "1.0",\r
+                "nova_object.namespace": "nova"\r
+            },\r
+            "user_id":"fake",\r
+            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"\r
+        },\r
+        "nova_object.name":"InstanceActionPayload",\r
+        "nova_object.namespace":"nova",\r
+        "nova_object.version":"1.0"\r
+    },\r
+    "priority":"INFO",\r
+    "publisher_id":"nova-compute:compute"\r
+}\r

diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json
new file mode 100644 (file)
index 0000000..6bfad13
--- /dev/null
+++ b/doc/notification_samples/instance-shelve_offload-start.json
@@ -0,0 +1,62 @@
+{\r
+    "event_type":"instance.shelve_offload.start",\r
+    "payload":{\r
+        "nova_object.data":{\r
+            "architecture":"x86_64",\r
+            "availability_zone":null,\r
+            "created_at":"2012-10-29T13:42:11Z",\r
+            "deleted_at":null,\r
+            "display_name":"some-server",\r
+            "fault":null,\r
+            "host":"compute",\r
+            "host_name":"some-server",\r
+            "ip_addresses": [{\r
+                "nova_object.name": "IpPayload",\r
+                "nova_object.namespace": "nova",\r
+                "nova_object.version": "1.0",\r
+                "nova_object.data": {\r
+                    "mac": "fa:16:3e:4c:2c:30",\r
+                    "address": "192.168.1.3",\r
+                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",\r
+                    "meta": {},\r
+                    "version": 4,\r
+                    "label": "private-network",\r
+                    "device_name": "tapce531f90-19"\r
+                }\r
+            }],\r
+            "kernel_id":"",\r
+            "launched_at":"2012-10-29T13:42:11Z",\r
+            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",\r
+            "metadata":{},\r
+            "node":"fake-mini",\r
+            "os_type":null,\r
+            "progress":0,\r
+            "ramdisk_id":"",\r
+            "reservation_id":"r-npxv0e40",\r
+            "state":"shelved",\r
+            "task_state":"shelving_offloading",\r
+            "power_state":"running",\r
+            "tenant_id":"6f70656e737461636b20342065766572",\r
+            "terminated_at":null,\r
+            "flavor": {\r
+                "nova_object.name": "FlavorPayload",\r
+                "nova_object.data": {\r
+                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",\r
+                    "root_gb": 1,\r
+                    "vcpus": 1,\r
+                    "ephemeral_gb": 0,\r
+                    "memory_mb": 512\r
+                },\r
+                "nova_object.version": "1.0",\r
+                "nova_object.namespace": "nova"\r
+            },\r
+            "user_id":"fake",\r
+            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"\r
+        },\r
+        "nova_object.name":"InstanceActionPayload",\r
+        "nova_object.namespace":"nova",\r
+        "nova_object.version":"1.0"\r
+    },\r
+    "priority":"INFO",\r
+    "publisher_id":"nova-compute:compute"\r
+}\r

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 82aa298f99ffa3cdbaabde70c1b99da23c2f69d5..451c49bb8801ac483731b179a8f816d13522730d 100644 (file)
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -4244,6 +4244,9 @@ class ComputeManager(manager.Manager):
         LOG.info(_LI('Shelve offloading'), instance=instance)
         self._notify_about_instance_usage(context, instance,
                 'shelve_offload.start')
+        compute_utils.notify_about_instance_action(context, instance,
+                self.host, action=fields.NotificationAction.SHELVE_OFFLOAD,
+                phase=fields.NotificationPhase.START)
 
         self._power_off_instance(context, instance, clean_shutdown)
         current_power_state = self._get_power_state(context, instance)
@@ -4277,6 +4280,9 @@ class ComputeManager(manager.Manager):
         self._delete_scheduler_instance_info(context, instance.uuid)
         self._notify_about_instance_usage(context, instance,
                 'shelve_offload.end')
+        compute_utils.notify_about_instance_action(context, instance,
+                self.host, action=fields.NotificationAction.SHELVE_OFFLOAD,
+                phase=fields.NotificationPhase.END)
 
     @wrap_exception()
     @reverts_task_state

diff --git a/nova/notifications/objects/instance.py b/nova/notifications/objects/instance.py
index d15c490dd8a0f3482bdd126f4c05d9c8d0250cb6..bd8f78dbc2e4d7354070b0dbfd9d9fe08e438978 100644 (file)
--- a/nova/notifications/objects/instance.py
+++ b/nova/notifications/objects/instance.py
@@ -294,8 +294,8 @@ class InstanceStateUpdatePayload(base.NotificationPayloadBase):
 # @base.notification_sample('instance-resize_prep-start.json')
 # @base.notification_sample('instance-resize_revert-start.json')
 # @base.notification_sample('instance-resize_revert-end.json')
-# @base.notification_sample('instance-shelve_offload-start.json')
-# @base.notification_sample('instance-shelve_offload-end.json')
+@base.notification_sample('instance-shelve_offload-start.json')
+@base.notification_sample('instance-shelve_offload-end.json')
 # @base.notification_sample('instance-soft_delete-start.json')
 # @base.notification_sample('instance-soft_delete-end.json')
 # @base.notification_sample('instance-trigger_crash_dump-start.json')

diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py
index f3fc1f5a19ec09db71d0cb08e2d49273287ff565..472e9d0e7dad2a8bca8fc800205a90ed55ac6484 100644 (file)
--- a/nova/tests/functional/notification_sample_tests/test_instance.py
+++ b/nova/tests/functional/notification_sample_tests/test_instance.py
@@ -65,6 +65,7 @@ class TestInstanceNotificationSample(
             self._test_suspend_server,
             self._test_pause_server,
             self._test_shelve_server,
+            self._test_shelve_offload_server,
             self._test_resize_server,
         ]
 
@@ -280,6 +281,45 @@ class TestInstanceNotificationSample(
         self.api.post_server_action(server['id'], post)
         self._wait_for_state_change(self.admin_api, server, 'ACTIVE')
 
+    def _test_shelve_offload_server(self, server):
+        self.flags(shelved_offload_time=-1)
+        self.api.post_server_action(server['id'], {'shelve': {}})
+        self._wait_for_state_change(self.api, server,
+                                    expected_status='SHELVED')
+        self.api.post_server_action(server['id'], {'shelveOffload': {}})
+        self._wait_for_state_change(self.api, server,
+                                    expected_status='SHELVED_OFFLOADED')
+
+        self.assertEqual(4, len(fake_notifier.VERSIONED_NOTIFICATIONS))
+        self._verify_notification(
+            'instance-shelve-start',
+            replacements={
+                'reservation_id': server['reservation_id'],
+                'uuid': server['id']},
+            actual=fake_notifier.VERSIONED_NOTIFICATIONS[0])
+        self._verify_notification(
+            'instance-shelve-end',
+            replacements={
+                'reservation_id': server['reservation_id'],
+                'uuid': server['id']},
+            actual=fake_notifier.VERSIONED_NOTIFICATIONS[1])
+
+        self._verify_notification(
+            'instance-shelve_offload-start',
+            replacements={
+                'reservation_id': server['reservation_id'],
+                'uuid': server['id']},
+            actual=fake_notifier.VERSIONED_NOTIFICATIONS[2])
+        self._verify_notification(
+            'instance-shelve_offload-end',
+            replacements={
+                'reservation_id': server['reservation_id'],
+                'uuid': server['id']},
+            actual=fake_notifier.VERSIONED_NOTIFICATIONS[3])
+
+        self.api.post_server_action(server['id'], {'unshelve': None})
+        self._wait_for_state_change(self.admin_api, server, 'ACTIVE')
+
     def _test_suspend_server(self, server):
         post = {'suspend': {}}
         self.api.post_server_action(server['id'], post)

diff --git a/nova/tests/unit/compute/test_shelve.py b/nova/tests/unit/compute/test_shelve.py
index 8512b9c00172e6a46f74834ca29c0754a7f6c518..25be85885509c4cb950b7f4eb9b7591b3cfc3ed4 100644 (file)
--- a/nova/tests/unit/compute/test_shelve.py
+++ b/nova/tests/unit/compute/test_shelve.py
@@ -161,7 +161,8 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
     def test_shelve_and_offload(self):
         self._shelve_instance(0)
 
-    def _shelve_offload(self, clean_shutdown=True):
+    @mock.patch('nova.compute.utils.notify_about_instance_action')
+    def _shelve_offload(self, mock_notify, clean_shutdown=True):
         host = 'fake-mini'
         instance = self._create_fake_instance_obj(params={'host': host})
         instance.task_state = task_states.SHELVING
@@ -195,6 +196,12 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
         with mock.patch.object(instance, 'save'):
             self.compute.shelve_offload_instance(self.context, instance,
                                                  clean_shutdown=clean_shutdown)
+            mock_notify.assert_has_calls([
+                mock.call(self.context, instance, 'fake-mini',
+                          action='shelve_offload', phase='start'),
+                mock.call(self.context, instance, 'fake-mini',
+                          action='shelve_offload', phase='end')])
+
         self.assertEqual(vm_states.SHELVED_OFFLOADED, instance.vm_state)
         self.assertIsNone(instance.task_state)