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
This commit is contained in:
Béla Vancsics
Gábor Antal
parent
7e36553fa1
commit
b1b86c8d91
62
doc/notification_samples/instance-shelve_offload-end.json
Normal file
62
doc/notification_samples/instance-shelve_offload-end.json
Normal file
@ -0,0 +1,62 @@
|
||||
{
|
||||
"event_type":"instance.shelve_offload.end",
|
||||
"payload":{
|
||||
"nova_object.data":{
|
||||
"architecture":"x86_64",
|
||||
"availability_zone":null,
|
||||
"created_at":"2012-10-29T13:42:11Z",
|
||||
"deleted_at":null,
|
||||
"display_name":"some-server",
|
||||
"fault":null,
|
||||
"host":null,
|
||||
"host_name":"some-server",
|
||||
"ip_addresses": [{
|
||||
"nova_object.name": "IpPayload",
|
||||
"nova_object.namespace": "nova",
|
||||
"nova_object.version": "1.0",
|
||||
"nova_object.data": {
|
||||
"mac": "fa:16:3e:4c:2c:30",
|
||||
"address": "192.168.1.3",
|
||||
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
|
||||
"meta": {},
|
||||
"version": 4,
|
||||
"label": "private-network",
|
||||
"device_name": "tapce531f90-19"
|
||||
}
|
||||
}],
|
||||
"kernel_id":"",
|
||||
"launched_at":"2012-10-29T13:42:11Z",
|
||||
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
|
||||
"metadata":{},
|
||||
"node":null,
|
||||
"os_type":null,
|
||||
"progress":0,
|
||||
"ramdisk_id":"",
|
||||
"reservation_id":"r-npxv0e40",
|
||||
"state":"shelved_offloaded",
|
||||
"task_state":null,
|
||||
"power_state":"running",
|
||||
"tenant_id":"6f70656e737461636b20342065766572",
|
||||
"terminated_at":null,
|
||||
"flavor": {
|
||||
"nova_object.name": "FlavorPayload",
|
||||
"nova_object.data": {
|
||||
"flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
|
||||
"root_gb": 1,
|
||||
"vcpus": 1,
|
||||
"ephemeral_gb": 0,
|
||||
"memory_mb": 512
|
||||
},
|
||||
"nova_object.version": "1.0",
|
||||
"nova_object.namespace": "nova"
|
||||
},
|
||||
"user_id":"fake",
|
||||
"uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"
|
||||
},
|
||||
"nova_object.name":"InstanceActionPayload",
|
||||
"nova_object.namespace":"nova",
|
||||
"nova_object.version":"1.0"
|
||||
},
|
||||
"priority":"INFO",
|
||||
"publisher_id":"nova-compute:compute"
|
||||
}
|
||||
62
doc/notification_samples/instance-shelve_offload-start.json
Normal file
62
doc/notification_samples/instance-shelve_offload-start.json
Normal file
@ -0,0 +1,62 @@
|
||||
{
|
||||
"event_type":"instance.shelve_offload.start",
|
||||
"payload":{
|
||||
"nova_object.data":{
|
||||
"architecture":"x86_64",
|
||||
"availability_zone":null,
|
||||
"created_at":"2012-10-29T13:42:11Z",
|
||||
"deleted_at":null,
|
||||
"display_name":"some-server",
|
||||
"fault":null,
|
||||
"host":"compute",
|
||||
"host_name":"some-server",
|
||||
"ip_addresses": [{
|
||||
"nova_object.name": "IpPayload",
|
||||
"nova_object.namespace": "nova",
|
||||
"nova_object.version": "1.0",
|
||||
"nova_object.data": {
|
||||
"mac": "fa:16:3e:4c:2c:30",
|
||||
"address": "192.168.1.3",
|
||||
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
|
||||
"meta": {},
|
||||
"version": 4,
|
||||
"label": "private-network",
|
||||
"device_name": "tapce531f90-19"
|
||||
}
|
||||
}],
|
||||
"kernel_id":"",
|
||||
"launched_at":"2012-10-29T13:42:11Z",
|
||||
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
|
||||
"metadata":{},
|
||||
"node":"fake-mini",
|
||||
"os_type":null,
|
||||
"progress":0,
|
||||
"ramdisk_id":"",
|
||||
"reservation_id":"r-npxv0e40",
|
||||
"state":"shelved",
|
||||
"task_state":"shelving_offloading",
|
||||
"power_state":"running",
|
||||
"tenant_id":"6f70656e737461636b20342065766572",
|
||||
"terminated_at":null,
|
||||
"flavor": {
|
||||
"nova_object.name": "FlavorPayload",
|
||||
"nova_object.data": {
|
||||
"flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
|
||||
"root_gb": 1,
|
||||
"vcpus": 1,
|
||||
"ephemeral_gb": 0,
|
||||
"memory_mb": 512
|
||||
},
|
||||
"nova_object.version": "1.0",
|
||||
"nova_object.namespace": "nova"
|
||||
},
|
||||
"user_id":"fake",
|
||||
"uuid":"178b0921-8f85-4257-88b6-2e743b5a975c"
|
||||
},
|
||||
"nova_object.name":"InstanceActionPayload",
|
||||
"nova_object.namespace":"nova",
|
||||
"nova_object.version":"1.0"
|
||||
},
|
||||
"priority":"INFO",
|
||||
"publisher_id":"nova-compute:compute"
|
||||
}
|
||||
@ -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
|
||||
|
||||
@ -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')
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user