openstack/nova
Code Issues Proposed changes

Merge "Improve flavor sample in notification sample tests"

Browse Source
This commit is contained in:
Jenkins 2017-01-23 15:03:31 +00:00 committed by Gerrit Code Review
commit 5ba04f4335
39 changed files with 121 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/notification_samples/instance-create-end.json
View File

@ -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

4
doc/notification_samples/instance-create-error.json
View File

@ -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

4
doc/notification_samples/instance-create-start.json
View File

@ -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

4
doc/notification_samples/instance-delete-end.json
View File

@ -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

4
doc/notification_samples/instance-delete-start.json
View File

@ -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

4
doc/notification_samples/instance-pause-end.json
View File

@ -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

4
doc/notification_samples/instance-pause-start.json
View File

@ -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

4
doc/notification_samples/instance-power_off-end.json
View File

@ -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

4
doc/notification_samples/instance-power_off-start.json
View File

@ -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

4
doc/notification_samples/instance-power_on-end.json
View File

@ -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

4
doc/notification_samples/instance-power_on-start.json
View File

@ -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

4
doc/notification_samples/instance-resize-end.json
View File

@ -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

4
doc/notification_samples/instance-resize-start.json
View File

@ -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

4
doc/notification_samples/instance-resize_finish-end.json
View File

@ -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

4
doc/notification_samples/instance-resize_finish-start.json
View File

@ -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

4
doc/notification_samples/instance-restore-end.json
View File

@ -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

4
doc/notification_samples/instance-restore-start.json
View File

@ -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

4
doc/notification_samples/instance-resume-end.json
View File

@ -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

4
doc/notification_samples/instance-resume-start.json
View File

@ -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

4
doc/notification_samples/instance-shelve-end.json
View File

@ -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

4
doc/notification_samples/instance-shelve-start.json
View File

@ -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

4
doc/notification_samples/instance-shelve_offload-end.json
View File

@ -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

4
doc/notification_samples/instance-shelve_offload-start.json
View File

@ -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

4
doc/notification_samples/instance-shutdown-end.json
View File

@ -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

4
doc/notification_samples/instance-shutdown-start.json
View File

@ -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

4
doc/notification_samples/instance-snapshot-end.json
View File

@ -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

4
doc/notification_samples/instance-snapshot-start.json
View File

@ -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

4
doc/notification_samples/instance-suspend-end.json
View File

@ -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

4
doc/notification_samples/instance-suspend-start.json
View File

@ -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

4
doc/notification_samples/instance-unpause-end.json
View File

@ -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

4
doc/notification_samples/instance-unpause-start.json
View File

@ -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

4
doc/notification_samples/instance-unshelve-end.json
View File

@ -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

4
doc/notification_samples/instance-unshelve-start.json
View File

@ -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

4
doc/notification_samples/instance-update.json
View File

@ -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

4
doc/notification_samples/instance-volume_swap-end.json
View File

@ -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

4
doc/notification_samples/instance-volume_swap-error.json
View File

@ -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

4
doc/notification_samples/instance-volume_swap-start.json
View File

@ -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

5
nova/tests/functional/notification_sample_tests/notification_sample_base.py
View File

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

5
nova/tests/functional/notification_sample_tests/test_instance.py
View File

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