diff --git a/doc/notification_samples/instance-create-end.json b/doc/notification_samples/instance-create-end.json index e33c0717f8..9ea78d54cf 100644 --- a/doc/notification_samples/instance-create-end.json +++ b/doc/notification_samples/instance-create-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-create-error.json b/doc/notification_samples/instance-create-error.json index 846f56ae3d..eafecee7c9 100644 --- a/doc/notification_samples/instance-create-error.json +++ b/doc/notification_samples/instance-create-error.json @@ -48,7 +48,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-create-start.json b/doc/notification_samples/instance-create-start.json index 9c730f7b2b..c72f7b87ab 100644 --- a/doc/notification_samples/instance-create-start.json +++ b/doc/notification_samples/instance-create-start.json @@ -38,7 +38,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-delete-end.json b/doc/notification_samples/instance-delete-end.json index 92cc3e59e4..1989584aa2 100644 --- a/doc/notification_samples/instance-delete-end.json +++ b/doc/notification_samples/instance-delete-end.json @@ -38,7 +38,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-delete-start.json b/doc/notification_samples/instance-delete-start.json index 08fb67c73b..2616b7a172 100644 --- a/doc/notification_samples/instance-delete-start.json +++ b/doc/notification_samples/instance-delete-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-pause-end.json b/doc/notification_samples/instance-pause-end.json index 52323bfe19..1e7f2146b3 100644 --- a/doc/notification_samples/instance-pause-end.json +++ b/doc/notification_samples/instance-pause-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-pause-start.json b/doc/notification_samples/instance-pause-start.json index 8af184bbb6..3bdd551caa 100644 --- a/doc/notification_samples/instance-pause-start.json +++ b/doc/notification_samples/instance-pause-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-power_off-end.json b/doc/notification_samples/instance-power_off-end.json index 7c5084571e..e0f99a26e6 100644 --- a/doc/notification_samples/instance-power_off-end.json +++ b/doc/notification_samples/instance-power_off-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-power_off-start.json b/doc/notification_samples/instance-power_off-start.json index daa721679e..54de4f029e 100644 --- a/doc/notification_samples/instance-power_off-start.json +++ b/doc/notification_samples/instance-power_off-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-power_on-end.json b/doc/notification_samples/instance-power_on-end.json index 08d46a2208..f08be50603 100644 --- a/doc/notification_samples/instance-power_on-end.json +++ b/doc/notification_samples/instance-power_on-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-power_on-start.json b/doc/notification_samples/instance-power_on-start.json index ba6e514183..92587a4b83 100644 --- a/doc/notification_samples/instance-power_on-start.json +++ b/doc/notification_samples/instance-power_on-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resize-end.json b/doc/notification_samples/instance-resize-end.json index 27c90fa923..860714f88b 100644 --- a/doc/notification_samples/instance-resize-end.json +++ b/doc/notification_samples/instance-resize-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resize-start.json b/doc/notification_samples/instance-resize-start.json index b56071f97f..0971f336c6 100644 --- a/doc/notification_samples/instance-resize-start.json +++ b/doc/notification_samples/instance-resize-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resize_finish-end.json b/doc/notification_samples/instance-resize_finish-end.json index 007ee71646..65cc35ec87 100644 --- a/doc/notification_samples/instance-resize_finish-end.json +++ b/doc/notification_samples/instance-resize_finish-end.json @@ -51,7 +51,9 @@ "memory_mb": 256, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "reset" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resize_finish-start.json b/doc/notification_samples/instance-resize_finish-start.json index 1787f20e66..6e6bed20f8 100644 --- a/doc/notification_samples/instance-resize_finish-start.json +++ b/doc/notification_samples/instance-resize_finish-start.json @@ -51,7 +51,9 @@ "memory_mb": 256, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "reset" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-restore-end.json b/doc/notification_samples/instance-restore-end.json index 0c5ca25391..e6d3fbc295 100644 --- a/doc/notification_samples/instance-restore-end.json +++ b/doc/notification_samples/instance-restore-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-restore-start.json b/doc/notification_samples/instance-restore-start.json index f0d6e124f2..5393681c6e 100644 --- a/doc/notification_samples/instance-restore-start.json +++ b/doc/notification_samples/instance-restore-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resume-end.json b/doc/notification_samples/instance-resume-end.json index c2589c0227..2bf5d10ae6 100644 --- a/doc/notification_samples/instance-resume-end.json +++ b/doc/notification_samples/instance-resume-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-resume-start.json b/doc/notification_samples/instance-resume-start.json index f5efef5012..ee83ae5da1 100644 --- a/doc/notification_samples/instance-resume-start.json +++ b/doc/notification_samples/instance-resume-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shelve-end.json b/doc/notification_samples/instance-shelve-end.json index a18b3e1a8a..d713c62c3d 100644 --- a/doc/notification_samples/instance-shelve-end.json +++ b/doc/notification_samples/instance-shelve-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shelve-start.json b/doc/notification_samples/instance-shelve-start.json index 3f0066e17d..34ee9df3af 100644 --- a/doc/notification_samples/instance-shelve-start.json +++ b/doc/notification_samples/instance-shelve-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json index 00bf5ddb2a..029eca9f6e 100644 --- a/doc/notification_samples/instance-shelve_offload-end.json +++ b/doc/notification_samples/instance-shelve_offload-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json index 570ba445fa..a60686d14e 100644 --- a/doc/notification_samples/instance-shelve_offload-start.json +++ b/doc/notification_samples/instance-shelve_offload-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shutdown-end.json b/doc/notification_samples/instance-shutdown-end.json index 308b0ac4bb..2083b66c2f 100644 --- a/doc/notification_samples/instance-shutdown-end.json +++ b/doc/notification_samples/instance-shutdown-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-shutdown-start.json b/doc/notification_samples/instance-shutdown-start.json index 2e1c6e8bd6..09afea752b 100644 --- a/doc/notification_samples/instance-shutdown-start.json +++ b/doc/notification_samples/instance-shutdown-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-snapshot-end.json b/doc/notification_samples/instance-snapshot-end.json index f93ef7a0f5..623de2c792 100644 --- a/doc/notification_samples/instance-snapshot-end.json +++ b/doc/notification_samples/instance-snapshot-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-snapshot-start.json b/doc/notification_samples/instance-snapshot-start.json index 43f9bf14fb..1c579b8576 100644 --- a/doc/notification_samples/instance-snapshot-start.json +++ b/doc/notification_samples/instance-snapshot-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-suspend-end.json b/doc/notification_samples/instance-suspend-end.json index 9fd890efe4..f63bc83b20 100644 --- a/doc/notification_samples/instance-suspend-end.json +++ b/doc/notification_samples/instance-suspend-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-suspend-start.json b/doc/notification_samples/instance-suspend-start.json index 5c9e3f7cf7..df1b38f6f7 100644 --- a/doc/notification_samples/instance-suspend-start.json +++ b/doc/notification_samples/instance-suspend-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-unpause-end.json b/doc/notification_samples/instance-unpause-end.json index a5d2482fed..646b152ae6 100644 --- a/doc/notification_samples/instance-unpause-end.json +++ b/doc/notification_samples/instance-unpause-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-unpause-start.json b/doc/notification_samples/instance-unpause-start.json index 8f8fb68f17..23b273ca1d 100644 --- a/doc/notification_samples/instance-unpause-start.json +++ b/doc/notification_samples/instance-unpause-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-unshelve-end.json b/doc/notification_samples/instance-unshelve-end.json index b2288d0a87..9de657c1dc 100644 --- a/doc/notification_samples/instance-unshelve-end.json +++ b/doc/notification_samples/instance-unshelve-end.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-unshelve-start.json b/doc/notification_samples/instance-unshelve-start.json index 47bceec5f5..334f3969b6 100644 --- a/doc/notification_samples/instance-unshelve-start.json +++ b/doc/notification_samples/instance-unshelve-start.json @@ -51,7 +51,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-update.json b/doc/notification_samples/instance-update.json index f3ad7e27d1..8838162890 100644 --- a/doc/notification_samples/instance-update.json +++ b/doc/notification_samples/instance-update.json @@ -56,7 +56,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-volume_swap-end.json b/doc/notification_samples/instance-volume_swap-end.json index f0358a5c9b..af22bc3a09 100644 --- a/doc/notification_samples/instance-volume_swap-end.json +++ b/doc/notification_samples/instance-volume_swap-end.json @@ -19,7 +19,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-volume_swap-error.json b/doc/notification_samples/instance-volume_swap-error.json index 01bc37be7b..e55d839ed5 100644 --- a/doc/notification_samples/instance-volume_swap-error.json +++ b/doc/notification_samples/instance-volume_swap-error.json @@ -29,7 +29,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/doc/notification_samples/instance-volume_swap-start.json b/doc/notification_samples/instance-volume_swap-start.json index 963f8fe63f..0590186044 100644 --- a/doc/notification_samples/instance-volume_swap-start.json +++ b/doc/notification_samples/instance-volume_swap-start.json @@ -19,7 +19,9 @@ "memory_mb": 512, "disabled": false, "rxtx_factor": 1.0, - "extra_specs": {}, + "extra_specs": { + "hw:watchdog_action": "disabled" + }, "swap": 0, "is_public": true, "vcpu_weight": 0 diff --git a/nova/tests/functional/notification_sample_tests/notification_sample_base.py b/nova/tests/functional/notification_sample_tests/notification_sample_base.py index cc1f7380db..129bbe6e41 100644 --- a/nova/tests/functional/notification_sample_tests/notification_sample_base.py +++ b/nova/tests/functional/notification_sample_tests/notification_sample_base.py @@ -143,6 +143,11 @@ class NotificationSampleTestBase(test.TestCase, }} flavor_id = self.api.post_flavor(flavor_body)['id'] + extra_specs = { + "extra_specs": { + "hw:watchdog_action": "disabled"}} + self.admin_api.post_extra_spec(flavor_id, extra_specs) + # Ignore the create flavor notification fake_notifier.reset() diff --git a/nova/tests/functional/notification_sample_tests/test_instance.py b/nova/tests/functional/notification_sample_tests/test_instance.py index 2ec054a546..4bd3e32204 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -491,6 +491,11 @@ class TestInstanceNotificationSample( } } other_flavor_id = self.api.post_flavor(other_flavor_body)['id'] + extra_specs = { + "extra_specs": { + "hw:watchdog_action": "reset"}} + self.admin_api.post_extra_spec(other_flavor_id, extra_specs) + # Ignore the create flavor notification fake_notifier.reset()