diff --git a/doc/notification_samples/common_payloads/FlavorPayload.json b/doc/notification_samples/common_payloads/FlavorPayload.json index 2e812a54d5c1..1062b482086c 100644 --- a/doc/notification_samples/common_payloads/FlavorPayload.json +++ b/doc/notification_samples/common_payloads/FlavorPayload.json @@ -15,8 +15,9 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description": null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" } diff --git a/doc/notification_samples/flavor-create.json b/doc/notification_samples/flavor-create.json index 4cca7a0e43aa..d7bee058dca1 100644 --- a/doc/notification_samples/flavor-create.json +++ b/doc/notification_samples/flavor-create.json @@ -2,7 +2,7 @@ "priority": "INFO", "payload": { "nova_object.namespace": "nova", - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.name": "FlavorPayload", "nova_object.data": { "name": "test_flavor", @@ -17,7 +17,8 @@ "vcpu_weight": 0, "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3", "extra_specs": null, - "projects": [] + "projects": [], + "description":null } }, "event_type": "flavor.create", diff --git a/doc/notification_samples/flavor-delete.json b/doc/notification_samples/flavor-delete.json index 1cad9c1f004e..7d777f87d0e1 100644 --- a/doc/notification_samples/flavor-delete.json +++ b/doc/notification_samples/flavor-delete.json @@ -2,7 +2,7 @@ "priority": "INFO", "payload": { "nova_object.namespace": "nova", - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.name": "FlavorPayload", "nova_object.data": { "name": "test_flavor", @@ -17,7 +17,8 @@ "vcpu_weight": 0, "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3", "extra_specs": null, - "projects": null + "projects": null, + "description":null } }, "event_type": "flavor.delete", diff --git a/doc/notification_samples/flavor-update.json b/doc/notification_samples/flavor-update.json index c76311a59971..e6af0d70c571 100644 --- a/doc/notification_samples/flavor-update.json +++ b/doc/notification_samples/flavor-update.json @@ -2,7 +2,7 @@ "priority": "INFO", "payload": { "nova_object.namespace": "nova", - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.name": "FlavorPayload", "nova_object.data": { "name": "test_flavor", @@ -20,7 +20,8 @@ "is_public": false, "root_gb": 10, "vcpu_weight": 0, - "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3" + "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3", + "description":null } }, "event_type": "flavor.update", diff --git a/doc/notification_samples/instance-create-end.json b/doc/notification_samples/instance-create-end.json index c27444e2e88c..5a7e951ceb52 100644 --- a/doc/notification_samples/instance-create-end.json +++ b/doc/notification_samples/instance-create-end.json @@ -73,9 +73,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "updated_at": "2012-10-29T13:42:11Z", diff --git a/doc/notification_samples/instance-create-error.json b/doc/notification_samples/instance-create-error.json index 221f43077eef..f43a9cfbfb0f 100644 --- a/doc/notification_samples/instance-create-error.json +++ b/doc/notification_samples/instance-create-error.json @@ -70,9 +70,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "updated_at": "2012-10-29T13:42:11Z", diff --git a/doc/notification_samples/instance-create-start.json b/doc/notification_samples/instance-create-start.json index 00d790f6adb5..4a67dc6a572f 100644 --- a/doc/notification_samples/instance-create-start.json +++ b/doc/notification_samples/instance-create-start.json @@ -60,9 +60,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "updated_at": null, diff --git a/doc/notification_samples/instance-live_migration_abort-end.json b/doc/notification_samples/instance-live_migration_abort-end.json index ebd85b62d61e..ce3a1666072b 100755 --- a/doc/notification_samples/instance-live_migration_abort-end.json +++ b/doc/notification_samples/instance-live_migration_abort-end.json @@ -40,11 +40,12 @@ "rxtx_factor":1.0, "swap":0, "vcpu_weight":0, - "vcpus":1 + "vcpus":1, + "description":null }, "nova_object.name":"FlavorPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.3" + "nova_object.version":"1.4" }, "host":"compute", "host_name":"some-server", diff --git a/doc/notification_samples/instance-live_migration_abort-start.json b/doc/notification_samples/instance-live_migration_abort-start.json index 5e82369bdf8f..69291cfdb872 100755 --- a/doc/notification_samples/instance-live_migration_abort-start.json +++ b/doc/notification_samples/instance-live_migration_abort-start.json @@ -40,11 +40,12 @@ "rxtx_factor":1.0, "swap":0, "vcpu_weight":0, - "vcpus":1 + "vcpus":1, + "description":null }, "nova_object.name":"FlavorPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.3" + "nova_object.version":"1.4" }, "host":"compute", "host_name":"some-server", diff --git a/doc/notification_samples/instance-rebuild-end.json b/doc/notification_samples/instance-rebuild-end.json index 9b12768421a1..ff1b39894df7 100644 --- a/doc/notification_samples/instance-rebuild-end.json +++ b/doc/notification_samples/instance-rebuild-end.json @@ -21,7 +21,7 @@ "reservation_id": "r-wczvhcla", "flavor": { "nova_object.namespace": "nova", - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.data": { "disabled": false, "ephemeral_gb": 0, @@ -35,7 +35,8 @@ "rxtx_factor": 1.0, "swap": 0, "vcpu_weight": 0, - "vcpus": 1 + "vcpus": 1, + "description":null }, "nova_object.name": "FlavorPayload" }, diff --git a/doc/notification_samples/instance-rebuild-error.json b/doc/notification_samples/instance-rebuild-error.json index c840b05da96e..f1c06b840e69 100644 --- a/doc/notification_samples/instance-rebuild-error.json +++ b/doc/notification_samples/instance-rebuild-error.json @@ -66,9 +66,10 @@ "rxtx_factor": 1.0, "swap": 0, "vcpu_weight": 0, - "vcpus": 1 + "vcpus": 1, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "reservation_id": "r-pfiic52h", diff --git a/doc/notification_samples/instance-rebuild-start.json b/doc/notification_samples/instance-rebuild-start.json index d8a2543aa7bc..5935d74c35be 100644 --- a/doc/notification_samples/instance-rebuild-start.json +++ b/doc/notification_samples/instance-rebuild-start.json @@ -29,7 +29,7 @@ "flavor": { "nova_object.name": "FlavorPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.data": { "disabled": false, "ephemeral_gb": 0, @@ -43,7 +43,8 @@ "rxtx_factor": 1.0, "swap": 0, "vcpu_weight": 0, - "vcpus": 1 + "vcpus": 1, + "description":null } }, "terminated_at": null, diff --git a/doc/notification_samples/instance-resize-end.json b/doc/notification_samples/instance-resize-end.json index 7f647a9bd57d..c8004354df48 100644 --- a/doc/notification_samples/instance-resize-end.json +++ b/doc/notification_samples/instance-resize-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-resize-error.json b/doc/notification_samples/instance-resize-error.json index 2438ad027507..1fb2c281ad09 100644 --- a/doc/notification_samples/instance-resize-error.json +++ b/doc/notification_samples/instance-resize-error.json @@ -37,11 +37,12 @@ "rxtx_factor":1.0, "swap":0, "vcpu_weight":0, - "vcpus":1 + "vcpus":1, + "description":null }, "nova_object.name":"FlavorPayload", "nova_object.namespace":"nova", - "nova_object.version":"1.3" + "nova_object.version":"1.4" }, "host":"compute", "host_name":"some-server", diff --git a/doc/notification_samples/instance-resize-start.json b/doc/notification_samples/instance-resize-start.json index 81e96f965650..218063f09285 100644 --- a/doc/notification_samples/instance-resize-start.json +++ b/doc/notification_samples/instance-resize-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-resize_finish-end.json b/doc/notification_samples/instance-resize_finish-end.json index ce653793ce7d..6f8ce196377d 100644 --- a/doc/notification_samples/instance-resize_finish-end.json +++ b/doc/notification_samples/instance-resize_finish-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-resize_finish-start.json b/doc/notification_samples/instance-resize_finish-start.json index 153899dcb598..024a109cb71d 100644 --- a/doc/notification_samples/instance-resize_finish-start.json +++ b/doc/notification_samples/instance-resize_finish-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-restore-end.json b/doc/notification_samples/instance-restore-end.json index 22f23275bb97..daa5c945c645 100644 --- a/doc/notification_samples/instance-restore-end.json +++ b/doc/notification_samples/instance-restore-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-restore-start.json b/doc/notification_samples/instance-restore-start.json index df9a0fe82681..46372359bed8 100644 --- a/doc/notification_samples/instance-restore-start.json +++ b/doc/notification_samples/instance-restore-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-resume-end.json b/doc/notification_samples/instance-resume-end.json index 722fa701752f..8ec645360841 100644 --- a/doc/notification_samples/instance-resume-end.json +++ b/doc/notification_samples/instance-resume-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-resume-start.json b/doc/notification_samples/instance-resume-start.json index 1eab156d2ddb..d5548ba05b35 100644 --- a/doc/notification_samples/instance-resume-start.json +++ b/doc/notification_samples/instance-resume-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shelve-end.json b/doc/notification_samples/instance-shelve-end.json index 7a6afb9f25e0..5c3db4308adb 100644 --- a/doc/notification_samples/instance-shelve-end.json +++ b/doc/notification_samples/instance-shelve-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shelve-start.json b/doc/notification_samples/instance-shelve-start.json index 991de5a364f4..99cf09769cd4 100644 --- a/doc/notification_samples/instance-shelve-start.json +++ b/doc/notification_samples/instance-shelve-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json index 2a8ae4b4e929..90114e480526 100644 --- a/doc/notification_samples/instance-shelve_offload-end.json +++ b/doc/notification_samples/instance-shelve_offload-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json index 4376b8391f60..b1b3e019b969 100644 --- a/doc/notification_samples/instance-shelve_offload-start.json +++ b/doc/notification_samples/instance-shelve_offload-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shutdown-end.json b/doc/notification_samples/instance-shutdown-end.json index e05da1b31a7f..2b7186102cc4 100644 --- a/doc/notification_samples/instance-shutdown-end.json +++ b/doc/notification_samples/instance-shutdown-end.json @@ -58,9 +58,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-shutdown-start.json b/doc/notification_samples/instance-shutdown-start.json index 781d912735c3..161ab1260d72 100644 --- a/doc/notification_samples/instance-shutdown-start.json +++ b/doc/notification_samples/instance-shutdown-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-snapshot-end.json b/doc/notification_samples/instance-snapshot-end.json index 4f7069a39661..c032a2a994b0 100644 --- a/doc/notification_samples/instance-snapshot-end.json +++ b/doc/notification_samples/instance-snapshot-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-snapshot-start.json b/doc/notification_samples/instance-snapshot-start.json index 42bcda243826..d02790d5b077 100644 --- a/doc/notification_samples/instance-snapshot-start.json +++ b/doc/notification_samples/instance-snapshot-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-soft_delete-end.json b/doc/notification_samples/instance-soft_delete-end.json index d628054dd519..750114613d51 100644 --- a/doc/notification_samples/instance-soft_delete-end.json +++ b/doc/notification_samples/instance-soft_delete-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "updated_at": "2012-10-29T13:42:11Z", diff --git a/doc/notification_samples/instance-soft_delete-start.json b/doc/notification_samples/instance-soft_delete-start.json index d7da97cf33f4..a424f7555888 100644 --- a/doc/notification_samples/instance-soft_delete-start.json +++ b/doc/notification_samples/instance-soft_delete-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "updated_at": "2012-10-29T13:42:11Z", diff --git a/doc/notification_samples/instance-suspend-end.json b/doc/notification_samples/instance-suspend-end.json index 4d6bb3de8c16..70d20c2ba2c9 100644 --- a/doc/notification_samples/instance-suspend-end.json +++ b/doc/notification_samples/instance-suspend-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-suspend-start.json b/doc/notification_samples/instance-suspend-start.json index 6d06d802d16e..95c3fb76f428 100644 --- a/doc/notification_samples/instance-suspend-start.json +++ b/doc/notification_samples/instance-suspend-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-trigger_crash_dump-end.json b/doc/notification_samples/instance-trigger_crash_dump-end.json index cec6a769e64d..2c27a3c3b58e 100644 --- a/doc/notification_samples/instance-trigger_crash_dump-end.json +++ b/doc/notification_samples/instance-trigger_crash_dump-end.json @@ -74,9 +74,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id": "fake", diff --git a/doc/notification_samples/instance-trigger_crash_dump-start.json b/doc/notification_samples/instance-trigger_crash_dump-start.json index f16a60daedb1..ca731966dec2 100644 --- a/doc/notification_samples/instance-trigger_crash_dump-start.json +++ b/doc/notification_samples/instance-trigger_crash_dump-start.json @@ -74,9 +74,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id": "fake", diff --git a/doc/notification_samples/instance-unshelve-end.json b/doc/notification_samples/instance-unshelve-end.json index eb9cec4fac99..1eeb9e3c13de 100644 --- a/doc/notification_samples/instance-unshelve-end.json +++ b/doc/notification_samples/instance-unshelve-end.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-unshelve-start.json b/doc/notification_samples/instance-unshelve-start.json index da1637cc40c7..3b71b7fb6a17 100644 --- a/doc/notification_samples/instance-unshelve-start.json +++ b/doc/notification_samples/instance-unshelve-start.json @@ -71,9 +71,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "user_id":"fake", diff --git a/doc/notification_samples/instance-update-tags-action.json b/doc/notification_samples/instance-update-tags-action.json index b9b0d8495276..f589ebaf64fc 100644 --- a/doc/notification_samples/instance-update-tags-action.json +++ b/doc/notification_samples/instance-update-tags-action.json @@ -34,10 +34,11 @@ "rxtx_factor": 1.0, "swap": 0, "vcpu_weight": 0, - "vcpus": 1}, + "vcpus": 1, + "description":null}, "nova_object.name": "FlavorPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.3"}, + "nova_object.version": "1.4"}, "host": "compute", "host_name": "some-server", "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6", diff --git a/doc/notification_samples/instance-update.json b/doc/notification_samples/instance-update.json index 5bf7fa20b7b5..ccf8694f90d3 100644 --- a/doc/notification_samples/instance-update.json +++ b/doc/notification_samples/instance-update.json @@ -65,9 +65,10 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "tags": [], diff --git a/doc/notification_samples/instance-volume_attach-end.json b/doc/notification_samples/instance-volume_attach-end.json index 3e82848bf00a..cee1b41654f5 100644 --- a/doc/notification_samples/instance-volume_attach-end.json +++ b/doc/notification_samples/instance-volume_attach-end.json @@ -38,9 +38,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "host": "compute", diff --git a/doc/notification_samples/instance-volume_attach-error.json b/doc/notification_samples/instance-volume_attach-error.json index e0523a812761..4d22410c25f1 100644 --- a/doc/notification_samples/instance-volume_attach-error.json +++ b/doc/notification_samples/instance-volume_attach-error.json @@ -48,9 +48,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "host": "compute", diff --git a/doc/notification_samples/instance-volume_attach-start.json b/doc/notification_samples/instance-volume_attach-start.json index 1b397b382732..54c4ce38ebcc 100644 --- a/doc/notification_samples/instance-volume_attach-start.json +++ b/doc/notification_samples/instance-volume_attach-start.json @@ -38,9 +38,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "host": "compute", diff --git a/doc/notification_samples/instance-volume_detach-end.json b/doc/notification_samples/instance-volume_detach-end.json index e92d852da100..9cfed36aa9e7 100644 --- a/doc/notification_samples/instance-volume_detach-end.json +++ b/doc/notification_samples/instance-volume_detach-end.json @@ -38,9 +38,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "host": "compute", diff --git a/doc/notification_samples/instance-volume_detach-start.json b/doc/notification_samples/instance-volume_detach-start.json index d9c02e524cca..fc1814f49d0a 100644 --- a/doc/notification_samples/instance-volume_detach-start.json +++ b/doc/notification_samples/instance-volume_detach-start.json @@ -38,9 +38,10 @@ }, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, - "nova_object.version": "1.3", + "nova_object.version": "1.4", "nova_object.namespace": "nova" }, "host": "compute", diff --git a/doc/notification_samples/instance-volume_swap-end.json b/doc/notification_samples/instance-volume_swap-end.json index 54c36e51da9a..a2b2894528a4 100644 --- a/doc/notification_samples/instance-volume_swap-end.json +++ b/doc/notification_samples/instance-volume_swap-end.json @@ -37,11 +37,12 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, "nova_object.name": "FlavorPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.3" + "nova_object.version": "1.4" }, "host": "compute", "host_name": "some-server", diff --git a/doc/notification_samples/instance-volume_swap-error.json b/doc/notification_samples/instance-volume_swap-error.json index 3d7e81b5a9f3..e00c376e9d1b 100644 --- a/doc/notification_samples/instance-volume_swap-error.json +++ b/doc/notification_samples/instance-volume_swap-error.json @@ -47,11 +47,12 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, "nova_object.name": "FlavorPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.3" + "nova_object.version": "1.4" }, "host": "compute", "host_name": "some-server", diff --git a/doc/notification_samples/instance-volume_swap-start.json b/doc/notification_samples/instance-volume_swap-start.json index 493a1d4b495b..f2a9271bac38 100644 --- a/doc/notification_samples/instance-volume_swap-start.json +++ b/doc/notification_samples/instance-volume_swap-start.json @@ -37,11 +37,12 @@ "projects": null, "swap": 0, "is_public": true, - "vcpu_weight": 0 + "vcpu_weight": 0, + "description":null }, "nova_object.name": "FlavorPayload", "nova_object.namespace": "nova", - "nova_object.version": "1.3" + "nova_object.version": "1.4" }, "host": "compute", "host_name": "some-server", diff --git a/nova/notifications/objects/flavor.py b/nova/notifications/objects/flavor.py index 29a1cdd8afb1..bc0e292a2151 100644 --- a/nova/notifications/objects/flavor.py +++ b/nova/notifications/objects/flavor.py @@ -35,7 +35,8 @@ class FlavorPayload(base.NotificationPayloadBase): # Version 1.2: Add extra_specs and projects fields # Version 1.3: Make projects and extra_specs field nullable as they are # not always available when a notification is emitted. - VERSION = '1.3' + # Version 1.4: Added description field. + VERSION = '1.4' # NOTE: if we'd want to rename some fields(memory_mb->ram, root_gb->disk, # ephemeral_gb: ephemeral), bumping to payload version 2.0 will be needed. @@ -53,6 +54,7 @@ class FlavorPayload(base.NotificationPayloadBase): 'is_public': ('flavor', 'is_public'), 'extra_specs': ('flavor', 'extra_specs'), 'projects': ('flavor', 'projects'), + 'description': ('flavor', 'description') } fields = { @@ -69,6 +71,7 @@ class FlavorPayload(base.NotificationPayloadBase): 'is_public': fields.BooleanField(), 'extra_specs': fields.DictOfStringsField(nullable=True), 'projects': fields.ListOfStringsField(nullable=True), + 'description': fields.StringField(nullable=True) } def __init__(self, flavor): diff --git a/nova/tests/unit/notifications/objects/test_notification.py b/nova/tests/unit/notifications/objects/test_notification.py index 9c9b3a5876e3..6247a9bed7b2 100644 --- a/nova/tests/unit/notifications/objects/test_notification.py +++ b/nova/tests/unit/notifications/objects/test_notification.py @@ -377,7 +377,7 @@ notification_object_data = { 'ExceptionNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'ExceptionPayload': '1.0-27db46ee34cd97e39f2643ed92ad0cc5', 'FlavorNotification': '1.0-a73147b93b520ff0061865849d3dfa56', - 'FlavorPayload': '1.3-6335e626893d7df5f96f87e6731fef56', + 'FlavorPayload': '1.4-2e7011b8b4e59167fe8b7a0a81f0d452', 'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'InstanceActionPayload': '1.5-fb2804ce9b681bfb217e729153c22611', 'InstanceActionVolumeNotification': '1.0-a73147b93b520ff0061865849d3dfa56',