openstack/nova
Code Issues Proposed changes

Adding auto_disk_config field to InstancePayload

Browse Source 
Add auto_disk_config field to InstancePayload based on
instance.auto_disk_config boolean value. If true, set it to
AUTO else MANUAL.

Implements: bp additional-notification-fields-for-searchlight
Change-Id: I18af99479562e2fe5e74e6e1252b804b074fee58
This commit is contained in:
Sujitha 2017-01-11 21:43:07 +00:00 committed by Balazs Gibizer
parent eb1ac77dd7
commit bb7d5214a4
47 changed files with 120 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -37,6 +37,7 @@
"power_state":"pending", "power_state":"pending",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -64,7 +65,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"ERROR", "priority":"ERROR",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -27,6 +27,7 @@
"power_state":"pending", "power_state":"pending",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -54,7 +55,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -27,6 +27,7 @@
"power_state":"pending", "power_state":"pending",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":"2012-10-29T13:42:11Z", "terminated_at":"2012-10-29T13:42:11Z",
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -54,7 +55,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"shutdown", "power_state":"shutdown",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

3
doc/notification_samples/instance-reboot-end.json
View File

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19" "device_name": "tapce531f90-19"
} }
}], }],
"auto_disk_config":"MANUAL",
"kernel_id":"", "kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z", "launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

3
doc/notification_samples/instance-reboot-error.json
View File

@ -35,6 +35,7 @@
"device_name": "tapce531f90-19" "device_name": "tapce531f90-19"
} }
}], }],
"auto_disk_config":"MANUAL",
"kernel_id":"", "kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z", "launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
@ -77,7 +78,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"ERROR", "priority":"ERROR",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

3
doc/notification_samples/instance-reboot-start.json
View File

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19" "device_name": "tapce531f90-19"
} }
}], }],
"auto_disk_config":"MANUAL",
"kernel_id":"", "kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z", "launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

3
doc/notification_samples/instance-rebuild-end.json
View File

@ -3,7 +3,7 @@
"publisher_id": "nova-compute:compute", "publisher_id": "nova-compute:compute",
"payload": { "payload": {
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.1", "nova_object.version":"1.2",
"nova_object.data": { "nova_object.data": {
"node": "fake-mini", "node": "fake-mini",
"fault": null, "fault": null,
@ -12,6 +12,7 @@
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c", "image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
"display_name": "some-server", "display_name": "some-server",
"display_description": "some-server", "display_description": "some-server",
"auto_disk_config":"MANUAL",
"tenant_id": "6f70656e737461636b20342065766572", "tenant_id": "6f70656e737461636b20342065766572",
"kernel_id": "", "kernel_id": "",
"created_at": "2012-10-29T13:42:11Z", "created_at": "2012-10-29T13:42:11Z",

3
doc/notification_samples/instance-rebuild-error.json
View File

@ -11,6 +11,7 @@
"task_state": "rebuilding", "task_state": "rebuilding",
"deleted_at": null, "deleted_at": null,
"architecture": null, "architecture": null,
"auto_disk_config":"MANUAL",
"ramdisk_id": "", "ramdisk_id": "",
"locked": false, "locked": false,
"created_at": "2012-10-29T13:42:11Z", "created_at": "2012-10-29T13:42:11Z",
@ -76,7 +77,7 @@
"nova_object.namespace": "nova" "nova_object.namespace": "nova"
} }
}, },
"nova_object.version": "1.1", "nova_object.version":"1.2",
"nova_object.namespace": "nova" "nova_object.namespace": "nova"
}, },
"publisher_id": "nova-compute:compute", "publisher_id": "nova-compute:compute",

5
doc/notification_samples/instance-rebuild-start.json
View File

@ -5,13 +5,14 @@
"payload": { "payload": {
"nova_object.name": "InstanceActionPayload", "nova_object.name": "InstanceActionPayload",
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.1", "nova_object.version":"1.2",
"nova_object.data": { "nova_object.data": {
"display_description": "some-server", "display_description": "some-server",
"reservation_id": "r-rqe0mlje", "reservation_id": "r-rqe0mlje",
"progress": 0, "progress": 0,
"user_id": "fake", "user_id": "fake",
"task_state": "rebuilding", "task_state": "rebuilding",
"auto_disk_config":"MANUAL",
"node": "fake-mini", "node": "fake-mini",
"created_at": "2012-10-29T13:42:11Z", "created_at": "2012-10-29T13:42:11Z",
"kernel_id": "", "kernel_id": "",
@ -71,4 +72,4 @@
"fault": null "fault": null
} }
} }
} }

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -40,6 +40,7 @@
"power_state":"running", "power_state":"running",
"tenant_id":"6f70656e737461636b20342065766572", "tenant_id":"6f70656e737461636b20342065766572",
"terminated_at":null, "terminated_at":null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -67,7 +68,7 @@
}, },
"nova_object.name":"InstanceActionPayload", "nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova", "nova_object.namespace":"nova",
"nova_object.version":"1.1" "nova_object.version":"1.2"
}, },
"priority":"INFO", "priority":"INFO",
"publisher_id":"nova-compute:compute" "publisher_id":"nova-compute:compute"

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

@ -45,6 +45,7 @@
"nova_object.version": "1.0"}, "nova_object.version": "1.0"},
"tenant_id": "6f70656e737461636b20342065766572", "tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null, "terminated_at": null,
"auto_disk_config":"MANUAL",
"flavor": { "flavor": {
"nova_object.name": "FlavorPayload", "nova_object.name": "FlavorPayload",
"nova_object.data": { "nova_object.data": {
@ -72,7 +73,7 @@
"uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2"}, "uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2"},
"nova_object.name": "InstanceUpdatePayload", "nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.2"}, "nova_object.version": "1.3"},
"priority": "INFO", "priority": "INFO",
"publisher_id": "nova-compute:fake-mini" "publisher_id": "nova-compute:fake-mini"
} }

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

@ -64,12 +64,13 @@
"task_state": null, "task_state": null,
"tenant_id": "6f70656e737461636b20342065766572", "tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null, "terminated_at": null,
"auto_disk_config":"MANUAL",
"user_id": "fake", "user_id": "fake",
"uuid": "0ab886d0-7443-4107-9265-48371bfa662b" "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
}, },
"nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.1" "nova_object.version": "1.2"
}, },
"priority": "INFO", "priority": "INFO",
"publisher_id": "nova-compute:compute" "publisher_id": "nova-compute:compute"

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

@ -74,12 +74,13 @@
"task_state": null, "task_state": null,
"tenant_id": "6f70656e737461636b20342065766572", "tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null, "terminated_at": null,
"auto_disk_config":"MANUAL",
"user_id": "fake", "user_id": "fake",
"uuid": "0ab886d0-7443-4107-9265-48371bfa662b" "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
}, },
"nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.1" "nova_object.version": "1.2"
}, },
"priority": "ERROR", "priority": "ERROR",
"publisher_id": "nova-compute:compute" "publisher_id": "nova-compute:compute"

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

@ -64,12 +64,13 @@
"task_state": null, "task_state": null,
"tenant_id": "6f70656e737461636b20342065766572", "tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null, "terminated_at": null,
"auto_disk_config":"MANUAL",
"user_id": "fake", "user_id": "fake",
"uuid": "0ab886d0-7443-4107-9265-48371bfa662b" "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
}, },
"nova_object.name": "InstanceActionVolumeSwapPayload", "nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova", "nova_object.namespace": "nova",
"nova_object.version": "1.1" "nova_object.version": "1.2"
}, },
"priority": "INFO", "priority": "INFO",
"publisher_id": "nova-compute:compute" "publisher_id": "nova-compute:compute"

14
nova/notifications/objects/instance.py
View File

@ -49,10 +49,12 @@ class InstancePayload(base.NotificationPayloadBase):
'metadata': ('instance', 'metadata'), 'metadata': ('instance', 'metadata'),
'locked': ('instance', 'locked'), 'locked': ('instance', 'locked'),
'auto_disk_config': ('instance', 'auto_disk_config')
} }
# Version 1.0: Initial version # Version 1.0: Initial version
# Version 1.1: add locked and display_description field # Version 1.1: add locked and display_description field
VERSION = '1.1' # Version 1.2: Add auto_disk_config field
VERSION = '1.2'
fields = { fields = {
'uuid': fields.UUIDField(), 'uuid': fields.UUIDField(),
'user_id': fields.StringField(nullable=True), 'user_id': fields.StringField(nullable=True),
@ -87,6 +89,7 @@ class InstancePayload(base.NotificationPayloadBase):
'metadata': fields.DictOfStringsField(), 'metadata': fields.DictOfStringsField(),
'locked': fields.BooleanField(), 'locked': fields.BooleanField(),
'auto_disk_config': fields.DiskConfigField()
} }
def __init__(self, instance, **kwargs): def __init__(self, instance, **kwargs):
@ -113,7 +116,8 @@ class InstanceActionPayload(InstancePayload):
# No SCHEMA as all the additional fields are calculated # No SCHEMA as all the additional fields are calculated
# Version 1.1: locked and display_description added to InstancePayload # Version 1.1: locked and display_description added to InstancePayload
VERSION = '1.1' # Version 1.2: Added auto_disk_config field to InstancePayload
VERSION = '1.2'
fields = { fields = {
'fault': fields.ObjectField('ExceptionPayload', nullable=True), 'fault': fields.ObjectField('ExceptionPayload', nullable=True),
} }
@ -130,7 +134,8 @@ class InstanceActionVolumeSwapPayload(InstanceActionPayload):
# No SCHEMA as all the additional fields are calculated # No SCHEMA as all the additional fields are calculated
# Version 1.1: locked and display_description added to InstancePayload # Version 1.1: locked and display_description added to InstancePayload
VERSION = '1.1' # Version 1.2: Added auto_disk_config field to InstancePayload
VERSION = '1.2'
fields = { fields = {
'old_volume_id': fields.UUIDField(), 'old_volume_id': fields.UUIDField(),
'new_volume_id': fields.UUIDField(), 'new_volume_id': fields.UUIDField(),
@ -149,7 +154,8 @@ class InstanceUpdatePayload(InstancePayload):
# Version 1.0: Initial version # Version 1.0: Initial version
# Version 1.1: locked and display_description added to InstancePayload # Version 1.1: locked and display_description added to InstancePayload
# Version 1.2: Added tags field # Version 1.2: Added tags field
VERSION = '1.2' # Version 1.3: Added auto_disk_config field to InstancePayload
VERSION = '1.3'
fields = { fields = {
'state_update': fields.ObjectField('InstanceStateUpdatePayload'), 'state_update': fields.ObjectField('InstanceStateUpdatePayload'),
'audit_period': fields.ObjectField('AuditPeriodPayload'), 'audit_period': fields.ObjectField('AuditPeriodPayload'),

16
nova/objects/fields.py
View File

@ -333,6 +333,18 @@ class DiskBus(BaseNovaEnum):
ALL = (FDC, IDE, SATA, SCSI, USB, VIRTIO, XEN, LXC, UML) ALL = (FDC, IDE, SATA, SCSI, USB, VIRTIO, XEN, LXC, UML)
class DiskConfig(BaseNovaEnum):
MANUAL = "MANUAL"
AUTO = "AUTO"
ALL = (MANUAL, AUTO)
def coerce(self, obj, attr, value):
enum_value = DiskConfig.AUTO if value else DiskConfig.MANUAL
return super(DiskConfig, self).coerce(obj, attr, enum_value)
class FirmwareType(BaseNovaEnum): class FirmwareType(BaseNovaEnum):
UEFI = "uefi" UEFI = "uefi"
@ -1074,6 +1086,10 @@ class DiskBusField(BaseEnumField):
AUTO_TYPE = DiskBus() AUTO_TYPE = DiskBus()
class DiskConfigField(BaseEnumField):
AUTO_TYPE = DiskConfig()
class FirmwareTypeField(BaseEnumField): class FirmwareTypeField(BaseEnumField):
AUTO_TYPE = FirmwareType() AUTO_TYPE = FirmwareType()

3
nova/tests/unit/compute/test_compute_utils.py
View File

@ -513,7 +513,8 @@ class UsageInfoTestCase(test.TestCase):
self.assertEqual(str(flavor['flavorid']), flavorid) self.assertEqual(str(flavor['flavorid']), flavorid)
for attr in ('display_name', 'created_at', 'launched_at', for attr in ('display_name', 'created_at', 'launched_at',
'state', 'task_state', 'display_description', 'locked'): 'state', 'task_state', 'display_description', 'locked',
'auto_disk_config'):
self.assertIn(attr, payload, "Key %s not in payload" % attr) self.assertIn(attr, payload, "Key %s not in payload" % attr)
self.assertEqual(payload['image_uuid'], uuids.fake_image_ref) self.assertEqual(payload['image_uuid'], uuids.fake_image_ref)

9
nova/tests/unit/notifications/objects/test_notification.py
View File

@ -357,14 +357,14 @@ notification_object_data = {
'FlavorNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'FlavorNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'FlavorPayload': '1.3-6335e626893d7df5f96f87e6731fef56', 'FlavorPayload': '1.3-6335e626893d7df5f96f87e6731fef56',
'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceActionPayload': '1.1-8d12efc3251c606b61b3d479a9da51be', 'InstanceActionPayload': '1.2-b7b2481bcd0e1edcc1970ef7150df5aa',
'InstanceActionVolumeSwapNotification': 'InstanceActionVolumeSwapNotification':
'1.0-a73147b93b520ff0061865849d3dfa56', '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceActionVolumeSwapPayload': '1.1-fbb6618f652a7f88742495ea3185582c', 'InstanceActionVolumeSwapPayload': '1.2-d7925b763e0795f8e5c1aa0e95bd67bd',
'InstancePayload': '1.1-5b9e3a4bb805d9fed20063bc237e4913', 'InstancePayload': '1.2-a1988f6fe728bd4b478353a85c48ad55',
'InstanceStateUpdatePayload': '1.0-07e111c0fa0f6db0f79b0726d593e3da', 'InstanceStateUpdatePayload': '1.0-07e111c0fa0f6db0f79b0726d593e3da',
'InstanceUpdateNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'InstanceUpdateNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceUpdatePayload': '1.2-67174f00c1ed9b5a6c408a31bd2540a5', 'InstanceUpdatePayload': '1.3-5bf5f18ed1232b1d8884fa784b77728f',
'IpPayload': '1.0-8ecf567a99e516d4af094439a7632d34', 'IpPayload': '1.0-8ecf567a99e516d4af094439a7632d34',
'NotificationPublisher': '1.0-bbbc1402fb0e443a3eb227cc52b61545', 'NotificationPublisher': '1.0-bbbc1402fb0e443a3eb227cc52b61545',
'ServiceStatusNotification': '1.0-a73147b93b520ff0061865849d3dfa56', 'ServiceStatusNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
@ -447,6 +447,7 @@ class TestInstanceNotification(test.NoDBTestCase):
metadata={}, metadata={},
uuid=uuids.instance1, uuid=uuids.instance1,
locked=False, locked=False,
auto_disk_config=False,
**instance_values) **instance_values)
self.payload = { self.payload = {
'bandwidth': {}, 'bandwidth': {},