From af17b95073e283e61cad8757c4bdb30c36beec92 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Wed, 11 Jan 2017 19:50:20 +0100 Subject: [PATCH] Improve flavor sample in notification sample tests This patch adds an extra_specs key to the flavor used in the instance action sample test to make the samples more realistic. Change-Id: I5ec2b536469daaea16efb1ef1537a951dc52997a Implements: bp flavor-notifications --- doc/notification_samples/instance-create-end.json | 4 +++- doc/notification_samples/instance-create-error.json | 4 +++- doc/notification_samples/instance-create-start.json | 4 +++- doc/notification_samples/instance-delete-end.json | 4 +++- doc/notification_samples/instance-delete-start.json | 4 +++- doc/notification_samples/instance-pause-end.json | 4 +++- doc/notification_samples/instance-pause-start.json | 4 +++- doc/notification_samples/instance-power_off-end.json | 4 +++- doc/notification_samples/instance-power_off-start.json | 4 +++- doc/notification_samples/instance-power_on-end.json | 4 +++- doc/notification_samples/instance-power_on-start.json | 4 +++- doc/notification_samples/instance-resize-end.json | 4 +++- doc/notification_samples/instance-resize-start.json | 4 +++- doc/notification_samples/instance-resize_finish-end.json | 4 +++- doc/notification_samples/instance-resize_finish-start.json | 4 +++- doc/notification_samples/instance-restore-end.json | 4 +++- doc/notification_samples/instance-restore-start.json | 4 +++- doc/notification_samples/instance-resume-end.json | 4 +++- doc/notification_samples/instance-resume-start.json | 4 +++- doc/notification_samples/instance-shelve-end.json | 4 +++- doc/notification_samples/instance-shelve-start.json | 4 +++- doc/notification_samples/instance-shelve_offload-end.json | 4 +++- doc/notification_samples/instance-shelve_offload-start.json | 4 +++- doc/notification_samples/instance-shutdown-end.json | 4 +++- doc/notification_samples/instance-shutdown-start.json | 4 +++- doc/notification_samples/instance-snapshot-end.json | 4 +++- doc/notification_samples/instance-snapshot-start.json | 4 +++- doc/notification_samples/instance-suspend-end.json | 4 +++- doc/notification_samples/instance-suspend-start.json | 4 +++- doc/notification_samples/instance-unpause-end.json | 4 +++- doc/notification_samples/instance-unpause-start.json | 4 +++- doc/notification_samples/instance-unshelve-end.json | 4 +++- doc/notification_samples/instance-unshelve-start.json | 4 +++- doc/notification_samples/instance-update.json | 4 +++- doc/notification_samples/instance-volume_swap-end.json | 4 +++- doc/notification_samples/instance-volume_swap-error.json | 4 +++- doc/notification_samples/instance-volume_swap-start.json | 4 +++- .../notification_sample_tests/notification_sample_base.py | 5 +++++ .../functional/notification_sample_tests/test_instance.py | 5 +++++ 39 files changed, 121 insertions(+), 37 deletions(-) diff --git a/doc/notification_samples/instance-create-end.json b/doc/notification_samples/instance-create-end.json index 68dcbb1893..7b96aaa1ca 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 35be7f9347..b142c9f08c 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 e6ffc16a0f..fb733b470e 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 b99b578f99..a79cccdce8 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 c2fc55a666..febb90be52 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 41bc506104..1ea6aacc34 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 4097560b17..24edcf1e8c 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 84b427ed2c..a5a360c2b2 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 33d152d353..6e28a8bfb3 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 8a1fafb0de..000d5a147d 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 4df3d83e7c..f398f96b9d 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 05f9e7a3da..6ea40afa6e 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 f0db6b9971..76dcdde2c7 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 83b47dc270..c91b43b811 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 813f70f735..4461464f23 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 804408f2e5..ad571ee246 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 a2243df4a1..4ff8b23b75 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 60a853aa7f..09b7aa484a 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 8f5c294233..fe77c81245 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 b80cb9366a..6a95becf7d 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 dfdfe428d4..a0486fe324 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 9270dbd162..b46018b824 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 6b1a4c11e7..02740541f0 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 bd070d39c6..d942f1d904 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 5b2c075e98..76750fb1a5 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 8c20b13d93..561f424121 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 b6200721b2..9f737fb7ce 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 42d7f72335..44e224b4cc 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 e1619336f8..f0672544a7 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 39327369db..ad5c848242 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 cd419b8fa7..c5a7abf312 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 77201fc039..861730e454 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 8becf07999..7cd4189f81 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 ec4dd5839f..d41dc55969 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 10b4ea798d..9bfa535ebe 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 33e706fa27..2017b11440 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 38ff0ce487..6532947fe3 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 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 961b681892..cb875f9737 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()