diff --git a/doc/notification_samples/instance-create-end.json b/doc/notification_samples/instance-create-end.json index 68dcbb1893bc..7b96aaa1caa6 100644 --- a/doc/notification_samples/instance-create-end.json +++ b/doc/notification_samples/instance-create-end.json @@ -49,7 +49,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 35be7f9347be..b142c9f08c81 100644 --- a/doc/notification_samples/instance-create-error.json +++ b/doc/notification_samples/instance-create-error.json @@ -46,7 +46,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 e6ffc16a0fe9..fb733b470eb4 100644 --- a/doc/notification_samples/instance-create-start.json +++ b/doc/notification_samples/instance-create-start.json @@ -36,7 +36,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 b99b578f99f8..a79cccdce8c1 100644 --- a/doc/notification_samples/instance-delete-end.json +++ b/doc/notification_samples/instance-delete-end.json @@ -36,7 +36,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 c2fc55a6664e..febb90be5287 100644 --- a/doc/notification_samples/instance-delete-start.json +++ b/doc/notification_samples/instance-delete-start.json @@ -49,7 +49,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 41bc506104e9..1ea6aacc34a2 100644 --- a/doc/notification_samples/instance-pause-end.json +++ b/doc/notification_samples/instance-pause-end.json @@ -49,7 +49,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 4097560b172b..24edcf1e8cb0 100644 --- a/doc/notification_samples/instance-pause-start.json +++ b/doc/notification_samples/instance-pause-start.json @@ -49,7 +49,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 84b427ed2c16..a5a360c2b253 100644 --- a/doc/notification_samples/instance-power_off-end.json +++ b/doc/notification_samples/instance-power_off-end.json @@ -49,7 +49,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 33d152d35356..6e28a8bfb349 100644 --- a/doc/notification_samples/instance-power_off-start.json +++ b/doc/notification_samples/instance-power_off-start.json @@ -49,7 +49,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 8a1fafb0deac..000d5a147dd3 100644 --- a/doc/notification_samples/instance-power_on-end.json +++ b/doc/notification_samples/instance-power_on-end.json @@ -49,7 +49,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 4df3d83e7ccf..f398f96b9da7 100644 --- a/doc/notification_samples/instance-power_on-start.json +++ b/doc/notification_samples/instance-power_on-start.json @@ -49,7 +49,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 05f9e7a3dabc..6ea40afa6ef2 100644 --- a/doc/notification_samples/instance-resize-end.json +++ b/doc/notification_samples/instance-resize-end.json @@ -49,7 +49,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 f0db6b99718c..76dcdde2c751 100644 --- a/doc/notification_samples/instance-resize-start.json +++ b/doc/notification_samples/instance-resize-start.json @@ -49,7 +49,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 83b47dc270eb..c91b43b811b6 100644 --- a/doc/notification_samples/instance-resize_finish-end.json +++ b/doc/notification_samples/instance-resize_finish-end.json @@ -49,7 +49,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 813f70f735d5..4461464f23c7 100644 --- a/doc/notification_samples/instance-resize_finish-start.json +++ b/doc/notification_samples/instance-resize_finish-start.json @@ -49,7 +49,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 804408f2e54c..ad571ee246d7 100644 --- a/doc/notification_samples/instance-restore-end.json +++ b/doc/notification_samples/instance-restore-end.json @@ -49,7 +49,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 a2243df4a120..4ff8b23b758e 100644 --- a/doc/notification_samples/instance-restore-start.json +++ b/doc/notification_samples/instance-restore-start.json @@ -49,7 +49,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 60a853aa7f10..09b7aa484aff 100644 --- a/doc/notification_samples/instance-resume-end.json +++ b/doc/notification_samples/instance-resume-end.json @@ -49,7 +49,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 8f5c2942338a..fe77c812451a 100644 --- a/doc/notification_samples/instance-resume-start.json +++ b/doc/notification_samples/instance-resume-start.json @@ -49,7 +49,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 b80cb9366aab..6a95becf7ddb 100644 --- a/doc/notification_samples/instance-shelve-end.json +++ b/doc/notification_samples/instance-shelve-end.json @@ -49,7 +49,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 dfdfe428d426..a0486fe324b5 100644 --- a/doc/notification_samples/instance-shelve-start.json +++ b/doc/notification_samples/instance-shelve-start.json @@ -49,7 +49,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 9270dbd1628b..b46018b8242d 100644 --- a/doc/notification_samples/instance-shelve_offload-end.json +++ b/doc/notification_samples/instance-shelve_offload-end.json @@ -49,7 +49,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 6b1a4c11e7d5..02740541f0ce 100644 --- a/doc/notification_samples/instance-shelve_offload-start.json +++ b/doc/notification_samples/instance-shelve_offload-start.json @@ -49,7 +49,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 bd070d39c6fe..d942f1d904a8 100644 --- a/doc/notification_samples/instance-shutdown-end.json +++ b/doc/notification_samples/instance-shutdown-end.json @@ -49,7 +49,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 5b2c075e98e8..76750fb1a513 100644 --- a/doc/notification_samples/instance-shutdown-start.json +++ b/doc/notification_samples/instance-shutdown-start.json @@ -49,7 +49,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 8c20b13d936b..561f4241214d 100644 --- a/doc/notification_samples/instance-snapshot-end.json +++ b/doc/notification_samples/instance-snapshot-end.json @@ -49,7 +49,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 b6200721b23a..9f737fb7ce90 100644 --- a/doc/notification_samples/instance-snapshot-start.json +++ b/doc/notification_samples/instance-snapshot-start.json @@ -49,7 +49,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 42d7f723351d..44e224b4cc37 100644 --- a/doc/notification_samples/instance-suspend-end.json +++ b/doc/notification_samples/instance-suspend-end.json @@ -49,7 +49,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 e1619336f81c..f0672544a72b 100644 --- a/doc/notification_samples/instance-suspend-start.json +++ b/doc/notification_samples/instance-suspend-start.json @@ -49,7 +49,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 39327369dbe9..ad5c8482424c 100644 --- a/doc/notification_samples/instance-unpause-end.json +++ b/doc/notification_samples/instance-unpause-end.json @@ -49,7 +49,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 cd419b8fa7fe..c5a7abf31280 100644 --- a/doc/notification_samples/instance-unpause-start.json +++ b/doc/notification_samples/instance-unpause-start.json @@ -49,7 +49,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 77201fc03935..861730e45432 100644 --- a/doc/notification_samples/instance-unshelve-end.json +++ b/doc/notification_samples/instance-unshelve-end.json @@ -49,7 +49,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 8becf079996f..7cd4189f81e1 100644 --- a/doc/notification_samples/instance-unshelve-start.json +++ b/doc/notification_samples/instance-unshelve-start.json @@ -49,7 +49,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 ec4dd5839f0c..d41dc559692f 100644 --- a/doc/notification_samples/instance-update.json +++ b/doc/notification_samples/instance-update.json @@ -54,7 +54,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 10b4ea798d7c..9bfa535ebe71 100644 --- a/doc/notification_samples/instance-volume_swap-end.json +++ b/doc/notification_samples/instance-volume_swap-end.json @@ -18,7 +18,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 33e706fa2701..2017b114401d 100644 --- a/doc/notification_samples/instance-volume_swap-error.json +++ b/doc/notification_samples/instance-volume_swap-error.json @@ -28,7 +28,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 38ff0ce4877b..6532947fe3f8 100644 --- a/doc/notification_samples/instance-volume_swap-start.json +++ b/doc/notification_samples/instance-volume_swap-start.json @@ -18,7 +18,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 cc1f7380db8f..129bbe6e4115 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 961b68189224..cb875f9737b1 100644 --- a/nova/tests/functional/notification_sample_tests/test_instance.py +++ b/nova/tests/functional/notification_sample_tests/test_instance.py @@ -487,6 +487,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()