Merge "Improve flavor sample in notification sample tests"

2017-01-23 15:03:31 +00:00
parent ad78158deb af17b95073
commit 5ba04f4335
39 changed files with 121 additions and 37 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()

--- 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()