diff --git a/doc/notification_samples/instance-create-end.json b/doc/notification_samples/instance-create-end.json index 6808a9b0e538..c27444e2e88c 100644 --- a/doc/notification_samples/instance-create-end.json +++ b/doc/notification_samples/instance-create-end.json @@ -78,12 +78,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceCreatePayload", "nova_object.namespace":"nova", - "nova_object.version":"1.6" + "nova_object.version":"1.7" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-create-error.json b/doc/notification_samples/instance-create-error.json index e1238cb36d2c..221f43077eef 100644 --- a/doc/notification_samples/instance-create-error.json +++ b/doc/notification_samples/instance-create-error.json @@ -75,12 +75,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceCreatePayload", "nova_object.namespace":"nova", - "nova_object.version":"1.6" + "nova_object.version":"1.7" }, "priority":"ERROR", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-create-start.json b/doc/notification_samples/instance-create-start.json index 73bb9fcc4cfb..00d790f6adb5 100644 --- a/doc/notification_samples/instance-create-start.json +++ b/doc/notification_samples/instance-create-start.json @@ -65,12 +65,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": null, "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceCreatePayload", "nova_object.namespace":"nova", - "nova_object.version":"1.6" + "nova_object.version":"1.7" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-delete-end.json b/doc/notification_samples/instance-delete-end.json index eb2a35d9c523..681b6eb82baf 100644 --- a/doc/notification_samples/instance-delete-end.json +++ b/doc/notification_samples/instance-delete-end.json @@ -52,12 +52,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-delete-start.json b/doc/notification_samples/instance-delete-start.json index ad7a1ac38345..3b78b9c6cf7b 100644 --- a/doc/notification_samples/instance-delete-start.json +++ b/doc/notification_samples/instance-delete-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-live_migration_rollback-end.json b/doc/notification_samples/instance-live_migration_rollback-end.json index 801c773378bb..622027d13bc9 100644 --- a/doc/notification_samples/instance-live_migration_rollback-end.json +++ b/doc/notification_samples/instance-live_migration_rollback-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-live_migration_rollback-start.json b/doc/notification_samples/instance-live_migration_rollback-start.json index 1e3c4262427c..61298610105a 100644 --- a/doc/notification_samples/instance-live_migration_rollback-start.json +++ b/doc/notification_samples/instance-live_migration_rollback-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-pause-end.json b/doc/notification_samples/instance-pause-end.json index b2401597e925..1eb294c76bdd 100644 --- a/doc/notification_samples/instance-pause-end.json +++ b/doc/notification_samples/instance-pause-end.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-pause-start.json b/doc/notification_samples/instance-pause-start.json index eeba1c7f8e8e..c9393a2bec4b 100644 --- a/doc/notification_samples/instance-pause-start.json +++ b/doc/notification_samples/instance-pause-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-power_off-end.json b/doc/notification_samples/instance-power_off-end.json index c421e1747edd..925103903d74 100644 --- a/doc/notification_samples/instance-power_off-end.json +++ b/doc/notification_samples/instance-power_off-end.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-power_off-start.json b/doc/notification_samples/instance-power_off-start.json index 431ab6514063..8aacfd95ed86 100644 --- a/doc/notification_samples/instance-power_off-start.json +++ b/doc/notification_samples/instance-power_off-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-power_on-end.json b/doc/notification_samples/instance-power_on-end.json index 776ea6f92fdc..c93c2317ad27 100644 --- a/doc/notification_samples/instance-power_on-end.json +++ b/doc/notification_samples/instance-power_on-end.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-power_on-start.json b/doc/notification_samples/instance-power_on-start.json index dbd06bc7bafc..d11174083521 100644 --- a/doc/notification_samples/instance-power_on-start.json +++ b/doc/notification_samples/instance-power_on-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-reboot-end.json b/doc/notification_samples/instance-reboot-end.json index 2f4daca0e1dc..e5e65b50c873 100644 --- a/doc/notification_samples/instance-reboot-end.json +++ b/doc/notification_samples/instance-reboot-end.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-reboot-error.json b/doc/notification_samples/instance-reboot-error.json index 5b2f3fc4080d..4032f4791e74 100644 --- a/doc/notification_samples/instance-reboot-error.json +++ b/doc/notification_samples/instance-reboot-error.json @@ -86,12 +86,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"ERROR", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-reboot-start.json b/doc/notification_samples/instance-reboot-start.json index 4b1acb1f6fe2..d99c4fdc7171 100644 --- a/doc/notification_samples/instance-reboot-start.json +++ b/doc/notification_samples/instance-reboot-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-rebuild-end.json b/doc/notification_samples/instance-rebuild-end.json index c5607581eea9..9b12768421a1 100644 --- a/doc/notification_samples/instance-rebuild-end.json +++ b/doc/notification_samples/instance-rebuild-end.json @@ -3,7 +3,7 @@ "publisher_id": "nova-compute:compute", "payload": { "nova_object.namespace": "nova", - "nova_object.version": "1.4", + "nova_object.version": "1.5", "nova_object.data": { "node": "fake-mini", "fault": null, @@ -80,7 +80,8 @@ "ramdisk_id": "", "architecture": null, "progress": 0, - "task_state": null + "task_state": null, + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionPayload" }, diff --git a/doc/notification_samples/instance-rebuild-error.json b/doc/notification_samples/instance-rebuild-error.json index 0e6e49b56773..9a9ea19ba6dd 100644 --- a/doc/notification_samples/instance-rebuild-error.json +++ b/doc/notification_samples/instance-rebuild-error.json @@ -88,9 +88,10 @@ }, "nova_object.version": "1.0", "nova_object.namespace": "nova" - } + }, + "updated_at": "2012-10-29T13:42:11Z" }, - "nova_object.version": "1.4", + "nova_object.version": "1.5", "nova_object.namespace": "nova" }, "publisher_id": "nova-compute:compute", diff --git a/doc/notification_samples/instance-rebuild-start.json b/doc/notification_samples/instance-rebuild-start.json index 894e9c34f9ec..d8a2543aa7bc 100644 --- a/doc/notification_samples/instance-rebuild-start.json +++ b/doc/notification_samples/instance-rebuild-start.json @@ -5,7 +5,7 @@ "payload": { "nova_object.name": "InstanceActionPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.4", + "nova_object.version": "1.5", "nova_object.data": { "display_description": "some-server", "reservation_id": "r-rqe0mlje", @@ -82,7 +82,8 @@ "host": "compute", "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", "state": "active", - "fault": null + "fault": null, + "updated_at": "2012-10-29T13:42:11Z" } } } diff --git a/doc/notification_samples/instance-resize-end.json b/doc/notification_samples/instance-resize-end.json index b62cfe4541d7..7f647a9bd57d 100644 --- a/doc/notification_samples/instance-resize-end.json +++ b/doc/notification_samples/instance-resize-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-resize-start.json b/doc/notification_samples/instance-resize-start.json index 46c38921a9eb..81e96f965650 100644 --- a/doc/notification_samples/instance-resize-start.json +++ b/doc/notification_samples/instance-resize-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-resize_finish-end.json b/doc/notification_samples/instance-resize_finish-end.json index 4d8a40bc7323..ce653793ce7d 100644 --- a/doc/notification_samples/instance-resize_finish-end.json +++ b/doc/notification_samples/instance-resize_finish-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-resize_finish-start.json b/doc/notification_samples/instance-resize_finish-start.json index 99c7110ad0fc..153899dcb598 100644 --- a/doc/notification_samples/instance-resize_finish-start.json +++ b/doc/notification_samples/instance-resize_finish-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-restore-end.json b/doc/notification_samples/instance-restore-end.json index ecf7d561f231..22f23275bb97 100644 --- a/doc/notification_samples/instance-restore-end.json +++ b/doc/notification_samples/instance-restore-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-restore-start.json b/doc/notification_samples/instance-restore-start.json index e2e8ab961e44..df9a0fe82681 100644 --- a/doc/notification_samples/instance-restore-start.json +++ b/doc/notification_samples/instance-restore-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-resume-end.json b/doc/notification_samples/instance-resume-end.json index 5daaf75c4a4b..722fa701752f 100644 --- a/doc/notification_samples/instance-resume-end.json +++ b/doc/notification_samples/instance-resume-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-resume-start.json b/doc/notification_samples/instance-resume-start.json index 9eb3af058fa9..1eab156d2ddb 100644 --- a/doc/notification_samples/instance-resume-start.json +++ b/doc/notification_samples/instance-resume-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shelve-end.json b/doc/notification_samples/instance-shelve-end.json index 9fa778e2f9fe..d4fa1637e21c 100644 --- a/doc/notification_samples/instance-shelve-end.json +++ b/doc/notification_samples/instance-shelve-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shelve-start.json b/doc/notification_samples/instance-shelve-start.json index 794fa1977506..991de5a364f4 100644 --- a/doc/notification_samples/instance-shelve-start.json +++ b/doc/notification_samples/instance-shelve-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json index cf55623e78de..b82bf474747d 100644 --- a/doc/notification_samples/instance-shelve_offload-end.json +++ b/doc/notification_samples/instance-shelve_offload-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json index f46a49b08928..4a1bccc07a7d 100644 --- a/doc/notification_samples/instance-shelve_offload-start.json +++ b/doc/notification_samples/instance-shelve_offload-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shutdown-end.json b/doc/notification_samples/instance-shutdown-end.json index cc7383a9b419..e05da1b31a7f 100644 --- a/doc/notification_samples/instance-shutdown-end.json +++ b/doc/notification_samples/instance-shutdown-end.json @@ -64,11 +64,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-shutdown-start.json b/doc/notification_samples/instance-shutdown-start.json index b32868b9c381..781d912735c3 100644 --- a/doc/notification_samples/instance-shutdown-start.json +++ b/doc/notification_samples/instance-shutdown-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-snapshot-end.json b/doc/notification_samples/instance-snapshot-end.json index adce77a75954..2452086b63b1 100644 --- a/doc/notification_samples/instance-snapshot-end.json +++ b/doc/notification_samples/instance-snapshot-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-snapshot-start.json b/doc/notification_samples/instance-snapshot-start.json index 71d90bbf0428..c8b833fb6119 100644 --- a/doc/notification_samples/instance-snapshot-start.json +++ b/doc/notification_samples/instance-snapshot-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-soft_delete-end.json b/doc/notification_samples/instance-soft_delete-end.json index 08821c4984e9..d628054dd519 100644 --- a/doc/notification_samples/instance-soft_delete-end.json +++ b/doc/notification_samples/instance-soft_delete-end.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-soft_delete-start.json b/doc/notification_samples/instance-soft_delete-start.json index cb1534299eff..d7da97cf33f4 100644 --- a/doc/notification_samples/instance-soft_delete-start.json +++ b/doc/notification_samples/instance-soft_delete-start.json @@ -76,12 +76,13 @@ "nova_object.version": "1.3", "nova_object.namespace": "nova" }, + "updated_at": "2012-10-29T13:42:11Z", "user_id":"fake", "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-suspend-end.json b/doc/notification_samples/instance-suspend-end.json index 4b4ee2005924..4d6bb3de8c16 100644 --- a/doc/notification_samples/instance-suspend-end.json +++ b/doc/notification_samples/instance-suspend-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-suspend-start.json b/doc/notification_samples/instance-suspend-start.json index ef7bba9d8caa..6d06d802d16e 100644 --- a/doc/notification_samples/instance-suspend-start.json +++ b/doc/notification_samples/instance-suspend-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-unpause-end.json b/doc/notification_samples/instance-unpause-end.json index cc828e39be81..45ada48ec105 100644 --- a/doc/notification_samples/instance-unpause-end.json +++ b/doc/notification_samples/instance-unpause-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-unpause-start.json b/doc/notification_samples/instance-unpause-start.json index 4b3569637663..d5d23f8af2fb 100644 --- a/doc/notification_samples/instance-unpause-start.json +++ b/doc/notification_samples/instance-unpause-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-unshelve-end.json b/doc/notification_samples/instance-unshelve-end.json index e53c652ec2df..eb9cec4fac99 100644 --- a/doc/notification_samples/instance-unshelve-end.json +++ b/doc/notification_samples/instance-unshelve-end.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-unshelve-start.json b/doc/notification_samples/instance-unshelve-start.json index 387a3a68992f..3ef368d922b2 100644 --- a/doc/notification_samples/instance-unshelve-start.json +++ b/doc/notification_samples/instance-unshelve-start.json @@ -77,11 +77,12 @@ "nova_object.namespace": "nova" }, "user_id":"fake", - "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c" + "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name":"InstanceActionPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.4" + "nova_object.version":"1.5" }, "priority":"INFO", "publisher_id":"nova-compute:compute" diff --git a/doc/notification_samples/instance-update-tags-action.json b/doc/notification_samples/instance-update-tags-action.json index f73bef0035a6..b9b0d8495276 100644 --- a/doc/notification_samples/instance-update-tags-action.json +++ b/doc/notification_samples/instance-update-tags-action.json @@ -83,10 +83,12 @@ "tenant_id": "6f70656e737461636b20342065766572", "terminated_at": null, "user_id": "fake", - "uuid": "d5ca7280-1f12-4238-a86f-378bb5d93c38"}, + "uuid": "d5ca7280-1f12-4238-a86f-378bb5d93c38", + "updated_at": "2012-10-29T13:42:11Z" + }, "nova_object.name": "InstanceUpdatePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.5"}, + "nova_object.version": "1.6"}, "priority": "INFO", "publisher_id": "nova-api:fake-mini" } diff --git a/doc/notification_samples/instance-update.json b/doc/notification_samples/instance-update.json index 2312b770a264..5bf7fa20b7b5 100644 --- a/doc/notification_samples/instance-update.json +++ b/doc/notification_samples/instance-update.json @@ -72,10 +72,12 @@ }, "tags": [], "user_id": "fake", - "uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2"}, + "uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2", + "updated_at": null + }, "nova_object.name": "InstanceUpdatePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.5"}, + "nova_object.version": "1.6"}, "priority": "INFO", "publisher_id": "nova-compute:fake-mini" } diff --git a/doc/notification_samples/instance-volume_attach-end.json b/doc/notification_samples/instance-volume_attach-end.json index acce29ce92e5..3e82848bf00a 100644 --- a/doc/notification_samples/instance-volume_attach-end.json +++ b/doc/notification_samples/instance-volume_attach-end.json @@ -78,11 +78,12 @@ "terminated_at": null, "auto_disk_config": "MANUAL", "user_id": "fake", - "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" + "uuid": "0ab886d0-7443-4107-9265-48371bfa662b", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionVolumePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.2" + "nova_object.version": "1.3" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_attach-error.json b/doc/notification_samples/instance-volume_attach-error.json index 74be304f1f5c..e0523a812761 100644 --- a/doc/notification_samples/instance-volume_attach-error.json +++ b/doc/notification_samples/instance-volume_attach-error.json @@ -88,11 +88,12 @@ "terminated_at": null, "auto_disk_config": "MANUAL", "user_id": "fake", - "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" + "uuid": "0ab886d0-7443-4107-9265-48371bfa662b", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionVolumePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.2" + "nova_object.version": "1.3" }, "priority": "ERROR", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_attach-start.json b/doc/notification_samples/instance-volume_attach-start.json index fe57ae66d49f..1b397b382732 100644 --- a/doc/notification_samples/instance-volume_attach-start.json +++ b/doc/notification_samples/instance-volume_attach-start.json @@ -78,11 +78,12 @@ "terminated_at": null, "auto_disk_config": "MANUAL", "user_id": "fake", - "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" + "uuid": "0ab886d0-7443-4107-9265-48371bfa662b", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionVolumePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.2" + "nova_object.version": "1.3" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_detach-end.json b/doc/notification_samples/instance-volume_detach-end.json index 4d36a61c1a91..e92d852da100 100644 --- a/doc/notification_samples/instance-volume_detach-end.json +++ b/doc/notification_samples/instance-volume_detach-end.json @@ -78,11 +78,12 @@ "terminated_at": null, "auto_disk_config": "MANUAL", "user_id": "fake", - "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" + "uuid": "0ab886d0-7443-4107-9265-48371bfa662b", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionVolumePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.2" + "nova_object.version": "1.3" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_detach-start.json b/doc/notification_samples/instance-volume_detach-start.json index 0aa4f12da86c..d9c02e524cca 100644 --- a/doc/notification_samples/instance-volume_detach-start.json +++ b/doc/notification_samples/instance-volume_detach-start.json @@ -78,11 +78,12 @@ "terminated_at": null, "auto_disk_config": "MANUAL", "user_id": "fake", - "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" + "uuid": "0ab886d0-7443-4107-9265-48371bfa662b", + "updated_at": "2012-10-29T13:42:11Z" }, "nova_object.name": "InstanceActionVolumePayload", "nova_object.namespace": "nova", - "nova_object.version": "1.2" + "nova_object.version": "1.3" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_swap-end.json b/doc/notification_samples/instance-volume_swap-end.json index 2102422de903..54c36e51da9a 100644 --- a/doc/notification_samples/instance-volume_swap-end.json +++ b/doc/notification_samples/instance-volume_swap-end.json @@ -78,12 +78,13 @@ "tenant_id": "6f70656e737461636b20342065766572", "terminated_at": null, "auto_disk_config":"MANUAL", + "updated_at": "2012-10-29T13:42:11Z", "user_id": "fake", "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" }, "nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.4" + "nova_object.version": "1.5" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_swap-error.json b/doc/notification_samples/instance-volume_swap-error.json index 12b44f0f9c0b..3d7e81b5a9f3 100644 --- a/doc/notification_samples/instance-volume_swap-error.json +++ b/doc/notification_samples/instance-volume_swap-error.json @@ -88,12 +88,13 @@ "tenant_id": "6f70656e737461636b20342065766572", "terminated_at": null, "auto_disk_config":"MANUAL", + "updated_at": "2012-10-29T13:42:11Z", "user_id": "fake", "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" }, "nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.4" + "nova_object.version": "1.5" }, "priority": "ERROR", "publisher_id": "nova-compute:compute" diff --git a/doc/notification_samples/instance-volume_swap-start.json b/doc/notification_samples/instance-volume_swap-start.json index c33781f06519..493a1d4b495b 100644 --- a/doc/notification_samples/instance-volume_swap-start.json +++ b/doc/notification_samples/instance-volume_swap-start.json @@ -78,12 +78,13 @@ "tenant_id": "6f70656e737461636b20342065766572", "terminated_at": null, "auto_disk_config":"MANUAL", + "updated_at": "2012-10-29T13:42:11Z", "user_id": "fake", "uuid": "0ab886d0-7443-4107-9265-48371bfa662b" }, "nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.4" + "nova_object.version": "1.5" }, "priority": "INFO", "publisher_id": "nova-compute:compute" diff --git a/nova/notifications/objects/instance.py b/nova/notifications/objects/instance.py index 9fe72d2ccd1c..2faa786a59f4 100644 --- a/nova/notifications/objects/instance.py +++ b/nova/notifications/objects/instance.py @@ -48,6 +48,7 @@ class InstancePayload(base.NotificationPayloadBase): 'launched_at': ('instance', 'launched_at'), 'terminated_at': ('instance', 'terminated_at'), 'deleted_at': ('instance', 'deleted_at'), + 'updated_at': ('instance', 'updated_at'), 'state': ('instance', 'vm_state'), 'power_state': ('instance', 'power_state'), @@ -63,7 +64,8 @@ class InstancePayload(base.NotificationPayloadBase): # Version 1.2: Add auto_disk_config field # Version 1.3: Add key_name field # Version 1.4: Add BDM related data - VERSION = '1.4' + # Version 1.5: Add updated_at field + VERSION = '1.5' fields = { 'uuid': fields.UUIDField(), 'user_id': fields.StringField(nullable=True), @@ -90,6 +92,7 @@ class InstancePayload(base.NotificationPayloadBase): 'launched_at': fields.DateTimeField(nullable=True), 'terminated_at': fields.DateTimeField(nullable=True), 'deleted_at': fields.DateTimeField(nullable=True), + 'updated_at': fields.DateTimeField(nullable=True), 'state': fields.InstanceStateField(nullable=True), 'power_state': fields.InstancePowerStateField(nullable=True), @@ -125,7 +128,8 @@ class InstanceActionPayload(InstancePayload): # Version 1.2: Added auto_disk_config field to InstancePayload # Version 1.3: Added key_name field to InstancePayload # Version 1.4: Add BDM related data - VERSION = '1.4' + # Version 1.5: Added updated_at field to InstancePayload + VERSION = '1.5' fields = { 'fault': fields.ObjectField('ExceptionPayload', nullable=True), } @@ -138,10 +142,11 @@ class InstanceActionPayload(InstancePayload): @nova_base.NovaObjectRegistry.register_notification class InstanceActionVolumePayload(InstanceActionPayload): # Version 1.0: Initial version - # 1.1: Added key_name field to InstancePayload - # 1.2: Add BDM related data + # Version 1.1: Added key_name field to InstancePayload + # Version 1.2: Add BDM related data + # Version 1.3: Added updated_at field to InstancePayload - VERSION = '1.2' + VERSION = '1.3' fields = { 'volume_id': fields.UUIDField() } @@ -161,7 +166,8 @@ class InstanceActionVolumeSwapPayload(InstanceActionPayload): # Version 1.2: Added auto_disk_config field to InstancePayload # Version 1.3: Added key_name field to InstancePayload # Version 1.4: Add BDM related data - VERSION = '1.4' + # Version 1.5: Added updated_at field to InstancePayload + VERSION = '1.5' fields = { 'old_volume_id': fields.UUIDField(), 'new_volume_id': fields.UUIDField(), @@ -188,7 +194,8 @@ class InstanceCreatePayload(InstanceActionPayload): # 1.4: Add key_name field to InstancePayload # 1.5: Add BDM related data to InstancePayload # 1.6: Add tags field to InstanceCreatePayload - VERSION = '1.6' + # 1.7: Added updated_at field to InstancePayload + VERSION = '1.7' fields = { 'keypairs': fields.ListOfObjectsField('KeypairPayload'), @@ -213,7 +220,8 @@ class InstanceUpdatePayload(InstancePayload): # Version 1.3: Added auto_disk_config field to InstancePayload # Version 1.4: Added key_name field to InstancePayload # Version 1.5: Add BDM related data - VERSION = '1.5' + # Version 1.6: Added updated_at field to InstancePayload + VERSION = '1.6' fields = { 'state_update': fields.ObjectField('InstanceStateUpdatePayload'), 'audit_period': fields.ObjectField('AuditPeriodPayload'), diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index f75228b0f8e0..79254bafcc7a 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -271,7 +271,8 @@ class TestInstanceNotificationSample( # scheduled {'host': 'compute', 'node': 'fake-mini', - 'state_update.old_task_state': None}, + 'state_update.old_task_state': None, + 'updated_at': '2012-10-29T13:42:11Z'}, # building -> networking {'state_update.new_task_state': 'networking', diff --git a/nova/tests/unit/notifications/objects/test_notification.py b/nova/tests/unit/notifications/objects/test_notification.py index fd483016fca8..6208839105f7 100644 --- a/nova/tests/unit/notifications/objects/test_notification.py +++ b/nova/tests/unit/notifications/objects/test_notification.py @@ -378,18 +378,18 @@ notification_object_data = { 'FlavorNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'FlavorPayload': '1.3-6335e626893d7df5f96f87e6731fef56', 'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'InstanceActionPayload': '1.4-2a206cf87e4060c2ec43ed71c4a2ed42', + 'InstanceActionPayload': '1.5-fb2804ce9b681bfb217e729153c22611', 'InstanceActionVolumeNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'InstanceActionVolumePayload': '1.2-414024a2ea54cf842482c1c6a4bef013', + 'InstanceActionVolumePayload': '1.3-f175b22ac6d6d0aea2bac21e12156e77', 'InstanceActionVolumeSwapNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'InstanceActionVolumeSwapPayload': '1.4-8b82cef523c62020c24b3eb1c39ea2ef', + 'InstanceActionVolumeSwapPayload': '1.5-bccb88cda36276d20a9b3e427b999929', 'InstanceCreateNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'InstanceCreatePayload': '1.6-b117dd709616d60cf5e126b983c72cd2', - 'InstancePayload': '1.4-46d922bd0a5cce46398b0cf7e8735fc4', + 'InstanceCreatePayload': '1.7-a35b2f3aa64dcc262ebb830e78939bdb', + 'InstancePayload': '1.5-201d852973dbcb5caab89082a3140487', 'InstanceStateUpdatePayload': '1.0-07e111c0fa0f6db0f79b0726d593e3da', 'InstanceUpdateNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'InstanceUpdatePayload': '1.5-ec4d3d9c809842b1dcf4739b1d788f32', + 'InstanceUpdatePayload': '1.6-9145c7cac4208eb841ceaaa9c10b2d9b', 'IpPayload': '1.0-8ecf567a99e516d4af094439a7632d34', 'KeypairNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'KeypairPayload': '1.0-6daebbbde0e1bf35c1556b1ecd9385c1',