openstack
/
nova
Code Issues Proposed changes

Add key_name field to InstancePayload 

Add key_name field to InstancePayload which means every instance.<action>
notification now have key_name field based on the instance.key_name.

Change-Id: I39059c5077c790aa85dff6b4563f581c54536b86
Implements: bp additional-notification-fields-for-searchlight
This commit is contained in:
Balazs Gibizer 2017-05-05 19:09:49 +02:00
parent f756964b22
commit bae0deb137
56 changed files with 129 additions and 66 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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"keypairs": [{
"nova_object.name": "KeypairPayload",
"nova_object.namespace": "nova",
@ -80,7 +81,7 @@
},
"nova_object.name":"InstanceCreatePayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.3"
"nova_object.version":"1.4"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -22,6 +22,7 @@
"host":"compute",
"host_name":"some-server",
"ip_addresses": [],
"key_name": "my-key",
"keypairs": [{
"nova_object.name": "KeypairPayload",
"nova_object.namespace": "nova",
@ -77,7 +78,7 @@
},
"nova_object.name":"InstanceCreatePayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.3"
"nova_object.version":"1.4"
},
"priority":"ERROR",
"publisher_id":"nova-compute:compute"

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

@ -12,6 +12,7 @@
"host":null,
"host_name":"some-server",
"ip_addresses": [],
"key_name": "my-key",
"keypairs": [{
"nova_object.name": "KeypairPayload",
"nova_object.namespace": "nova",
@ -67,7 +68,7 @@
},
"nova_object.name":"InstanceCreatePayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.3"
"nova_object.version":"1.4"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -12,6 +12,7 @@
"host":"compute",
"host_name":"some-server",
"ip_addresses":[],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -55,7 +56,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"auto_disk_config":"MANUAL",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -36,6 +36,7 @@
}
}],
"auto_disk_config":"MANUAL",
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -78,7 +79,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"ERROR",
"publisher_id":"nova-compute:compute"

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

@ -26,6 +26,7 @@
}
}],
"auto_disk_config":"MANUAL",
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -3,7 +3,7 @@
"publisher_id": "nova-compute:compute",
"payload": {
"nova_object.namespace": "nova",
"nova_object.version":"1.2",
"nova_object.version":"1.3",
"nova_object.data": {
"node": "fake-mini",
"fault": null,
@ -14,6 +14,7 @@
"display_description": "some-server",
"auto_disk_config":"MANUAL",
"tenant_id": "6f70656e737461636b20342065766572",
"key_name": "my-key",
"kernel_id": "",
"created_at": "2012-10-29T13:42:11Z",
"host": "compute",

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

@ -5,6 +5,7 @@
"nova_object.data": {
"state": "active",
"availability_zone": "nova",
"key_name": "my-key",
"kernel_id": "",
"host_name": "some-server",
"progress": 0,
@ -77,7 +78,7 @@
"nova_object.namespace": "nova"
}
},
"nova_object.version":"1.2",
"nova_object.version":"1.3",
"nova_object.namespace": "nova"
},
"publisher_id": "nova-compute:compute",

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

@ -5,7 +5,7 @@
"payload": {
"nova_object.name": "InstanceActionPayload",
"nova_object.namespace": "nova",
"nova_object.version":"1.2",
"nova_object.version":"1.3",
"nova_object.data": {
"display_description": "some-server",
"reservation_id": "r-rqe0mlje",
@ -15,6 +15,7 @@
"auto_disk_config":"MANUAL",
"node": "fake-mini",
"created_at": "2012-10-29T13:42:11Z",
"key_name": "my-key",
"kernel_id": "",
"metadata": {},
"deleted_at": null,

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -25,6 +25,7 @@
"device_name": "tapce531f90-19"
}
}],
"key_name": "my-key",
"kernel_id":"",
"launched_at":"2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
@ -68,7 +69,7 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.2"
"nova_object.version":"1.3"
},
"priority":"INFO",
"publisher_id":"nova-compute:compute"

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

@ -56,6 +56,7 @@
}
],
"kernel_id": "",
"key_name": "my-key",
"launched_at": "2012-10-29T13:42:11Z",
"locked": false,
"metadata": {},
@ -84,7 +85,7 @@
"uuid": "d5ca7280-1f12-4238-a86f-378bb5d93c38"},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.3"},
"nova_object.version": "1.4"},
"priority": "INFO",
"publisher_id": "nova-api:fake-mini"
}

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

@ -20,6 +20,7 @@
"host": "compute",
"host_name": "some-server",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"key_name": "my-key",
"kernel_id": "",
"launched_at": null,
"metadata": {},
@ -73,7 +74,7 @@
"uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2"},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.3"},
"nova_object.version": "1.4"},
"priority": "INFO",
"publisher_id": "nova-compute:fake-mini"
}

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -69,7 +70,7 @@
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
"nova_object.version": "1.1"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -58,6 +58,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -79,7 +80,7 @@
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
"nova_object.version": "1.1"
},
"priority": "ERROR",
"publisher_id": "nova-compute:compute"

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -69,7 +70,7 @@
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
"nova_object.version": "1.1"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -69,7 +70,7 @@
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
"nova_object.version": "1.1"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -69,7 +70,7 @@
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
"nova_object.version": "1.1"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -70,7 +71,7 @@
},
"nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.2"
"nova_object.version": "1.3"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -58,6 +58,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -80,7 +81,7 @@
},
"nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.2"
"nova_object.version": "1.3"
},
"priority": "ERROR",
"publisher_id": "nova-compute:compute"

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

@ -48,6 +48,7 @@
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}],
"key_name": "my-key",
"kernel_id": "",
"launched_at": "2012-10-29T13:42:11Z",
"metadata": {},
@ -70,7 +71,7 @@
},
"nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.2"
"nova_object.version": "1.3"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"

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

@ -35,6 +35,8 @@ class InstancePayload(base.NotificationPayloadBase):
'image_uuid': ('instance', 'image_ref'),
'key_name': ('instance', 'key_name'),
'kernel_id': ('instance', 'kernel_id'),
'ramdisk_id': ('instance', 'ramdisk_id'),
@ -55,7 +57,8 @@ class InstancePayload(base.NotificationPayloadBase):
# Version 1.0: Initial version
# Version 1.1: add locked and display_description field
# Version 1.2: Add auto_disk_config field
VERSION = '1.2'
# Version 1.3: Add key_name field
VERSION = '1.3'
fields = {
'uuid': fields.UUIDField(),
'user_id': fields.StringField(nullable=True),
@ -73,6 +76,8 @@ class InstancePayload(base.NotificationPayloadBase):
'flavor': fields.ObjectField('FlavorPayload'),
'image_uuid': fields.StringField(nullable=True),
'key_name': fields.StringField(nullable=True),
'kernel_id': fields.StringField(nullable=True),
'ramdisk_id': fields.StringField(nullable=True),
@ -108,7 +113,8 @@ class InstanceActionPayload(InstancePayload):
# Version 1.1: locked and display_description added to InstancePayload
# Version 1.2: Added auto_disk_config field to InstancePayload
VERSION = '1.2'
# Version 1.3: Added key_name field to InstancePayload
VERSION = '1.3'
fields = {
'fault': fields.ObjectField('ExceptionPayload', nullable=True),
}
@ -121,8 +127,9 @@ class InstanceActionPayload(InstancePayload):
@nova_base.NovaObjectRegistry.register_notification
class InstanceActionVolumePayload(InstanceActionPayload):
# Version 1.0: Initial version
# 1.1: Added key_name field to InstancePayload
VERSION = '1.0'
VERSION = '1.1'
fields = {
'volume_id': fields.UUIDField()
}
@ -140,7 +147,8 @@ class InstanceActionVolumeSwapPayload(InstanceActionPayload):
# Version 1.1: locked and display_description added to InstancePayload
# Version 1.2: Added auto_disk_config field to InstancePayload
VERSION = '1.2'
# Version 1.3: Added key_name field to InstancePayload
VERSION = '1.3'
fields = {
'old_volume_id': fields.UUIDField(),
'new_volume_id': fields.UUIDField(),
@ -164,7 +172,8 @@ class InstanceCreatePayload(InstanceActionPayload):
# instance.create notification using this new payload does not
# have decreasing version.
# 1.3: Add keypairs field
VERSION = '1.3'
# 1.4: Add key_name field to InstancePayload
VERSION = '1.4'
fields = {
'keypairs': fields.ListOfObjectsField('KeypairPayload')
@ -184,7 +193,8 @@ class InstanceUpdatePayload(InstancePayload):
# Version 1.1: locked and display_description added to InstancePayload
# Version 1.2: Added tags field
# Version 1.3: Added auto_disk_config field to InstancePayload
VERSION = '1.3'
# Version 1.4: Added key_name field to InstancePayload
VERSION = '1.4'
fields = {
'state_update': fields.ObjectField('InstanceStateUpdatePayload'),
'audit_period': fields.ObjectField('AuditPeriodPayload'),

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

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

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

@ -375,18 +375,18 @@ notification_object_data = {
'FlavorNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'FlavorPayload': '1.3-6335e626893d7df5f96f87e6731fef56',
'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceActionPayload': '1.2-b7b2481bcd0e1edcc1970ef7150df5aa',
'InstanceActionPayload': '1.3-b57b9564bf5a180c9d3999dfc2be4e29',
'InstanceActionVolumeNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceActionVolumePayload': '1.0-20c0dca4cfaf1a68d3e8c45e5aca3907',
'InstanceActionVolumePayload': '1.1-77163365e23cfff0bffa47d4ca5bf62e',
'InstanceActionVolumeSwapNotification':
'1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceActionVolumeSwapPayload': '1.2-d7925b763e0795f8e5c1aa0e95bd67bd',
'InstanceActionVolumeSwapPayload': '1.3-5efb715850d07c496447009ca14cec83',
'InstanceCreateNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceCreatePayload': '1.3-f365937eb5a0547055a679d1a99b7aeb',
'InstancePayload': '1.2-a1988f6fe728bd4b478353a85c48ad55',
'InstanceCreatePayload': '1.4-125ba6eacf5a567213600221b1e4a74c',
'InstancePayload': '1.3-7c6f0360955b22b492d6eaedd2192001',
'InstanceStateUpdatePayload': '1.0-07e111c0fa0f6db0f79b0726d593e3da',
'InstanceUpdateNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'InstanceUpdatePayload': '1.3-5bf5f18ed1232b1d8884fa784b77728f',
'InstanceUpdatePayload': '1.4-052b015d109385f3cbb2f1a0f33381c2',
'IpPayload': '1.0-8ecf567a99e516d4af094439a7632d34',
'KeypairNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
'KeypairPayload': '1.0-6daebbbde0e1bf35c1556b1ecd9385c1',