womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add shares to InstancePayload"

Browse Source
This commit is contained in:
Zuul
2024-12-09 00:38:54 +00:00
committed by Gerrit Code Review
parent e517c36bcf bf96ca7c9a
commit 338cbea72a
26 changed files with 542 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/notification_samples/common_payloads/InstanceActionPayload.json
+1 -1
View File
@@ -5,5 +5,5 @@
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.8"
"nova_object.version":"1.9"
}
doc/notification_samples/common_payloads/InstanceActionPayloadShareActive.json
+9
View File
@@ -0,0 +1,9 @@
{
"$ref": "InstancePayloadShareActive.json",
"nova_object.data": {
"fault": null
},
"nova_object.name": "InstanceActionPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.9"
}
doc/notification_samples/common_payloads/InstanceActionPayloadShareInactive.json
+9
View File
@@ -0,0 +1,9 @@
{
"$ref": "InstancePayloadShareInactive.json",
"nova_object.data": {
"fault": null
},
"nova_object.name": "InstanceActionPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.9"
}
doc/notification_samples/common_payloads/InstanceActionRebuildPayload.json
+8 -11
View File
@@ -1,13 +1,10 @@
{
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"architecture": null,
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
"trusted_image_certificates": [
"rebuild-cert-id-1",
"rebuild-cert-id-2"
]
},
"nova_object.name": "InstanceActionRebuildPayload",
"nova_object.version": "1.9"
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"architecture": null,
"image_uuid": "a2459075-d96c-40d5-893e-577ff92e721c",
"trusted_image_certificates": ["rebuild-cert-id-1", "rebuild-cert-id-2"]
},
"nova_object.name": "InstanceActionRebuildPayload",
"nova_object.version": "1.10"
}
doc/notification_samples/common_payloads/InstanceActionRescuePayload.json
+6 -6
View File
@@ -1,8 +1,8 @@
{
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"rescue_image_ref": "a2459075-d96c-40d5-893e-577ff92e721c"
},
"nova_object.name": "InstanceActionRescuePayload",
"nova_object.version": "1.3"
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"rescue_image_ref": "a2459075-d96c-40d5-893e-577ff92e721c"
},
"nova_object.name": "InstanceActionRescuePayload",
"nova_object.version": "1.4"
}
doc/notification_samples/common_payloads/InstanceActionResizePrepPayload.json
+27 -27
View File
@@ -1,31 +1,31 @@
{
"$ref": "InstanceActionPayload.json",
"nova_object.data":{
"new_flavor": {
"nova_object.name": "FlavorPayload",
"nova_object.data": {
"description": null,
"disabled": false,
"ephemeral_gb": 0,
"extra_specs": {
"hw:watchdog_action": "reset"
},
"flavorid": "d5a8bb54-365a-45ae-abdb-38d249df7845",
"is_public": true,
"memory_mb": 256,
"name": "other_flavor",
"projects": null,
"root_gb": 1,
"rxtx_factor": 1.0,
"swap": 0,
"vcpu_weight": 0,
"vcpus": 1
},
"nova_object.namespace": "nova",
"nova_object.version": "1.4"
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"new_flavor": {
"nova_object.name": "FlavorPayload",
"nova_object.data": {
"description": null,
"disabled": false,
"ephemeral_gb": 0,
"extra_specs": {
"hw:watchdog_action": "reset"
},
"task_state": "resize_prep"
"flavorid": "d5a8bb54-365a-45ae-abdb-38d249df7845",
"is_public": true,
"memory_mb": 256,
"name": "other_flavor",
"projects": null,
"root_gb": 1,
"rxtx_factor": 1.0,
"swap": 0,
"vcpu_weight": 0,
"vcpus": 1
},
"nova_object.namespace": "nova",
"nova_object.version": "1.4"
},
"nova_object.name": "InstanceActionResizePrepPayload",
"nova_object.version": "1.3"
"task_state": "resize_prep"
},
"nova_object.name": "InstanceActionResizePrepPayload",
"nova_object.version": "1.4"
}
doc/notification_samples/common_payloads/InstanceActionSnapshotPayload.json
+7 -7
View File
@@ -1,9 +1,9 @@
{
"$ref": "InstanceActionPayload.json",
"nova_object.data":{
"snapshot_image_id": "d2aae36f-785c-4518-8016-bc9534d9fc7f"
},
"nova_object.name":"InstanceActionSnapshotPayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.9"
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"snapshot_image_id": "d2aae36f-785c-4518-8016-bc9534d9fc7f"
},
"nova_object.name": "InstanceActionSnapshotPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.10"
}
doc/notification_samples/common_payloads/InstanceActionVolumePayload.json
+8 -8
View File
@@ -1,9 +1,9 @@
{
"$ref": "InstanceActionPayload.json",
"nova_object.data":{
"volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.6"
}
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
},
"nova_object.name": "InstanceActionVolumePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.7"
}
doc/notification_samples/common_payloads/InstanceActionVolumeSwapPayload.json
+1 -1
View File
@@ -6,5 +6,5 @@
},
"nova_object.name": "InstanceActionVolumeSwapPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.8"
"nova_object.version": "1.9"
}
doc/notification_samples/common_payloads/InstanceCreatePayload.json
+23 -26
View File
@@ -1,28 +1,25 @@
{
"$ref":"InstanceActionPayload.json",
"nova_object.data": {
"block_devices": [],
"keypairs": [
{
"nova_object.version": "1.0",
"nova_object.namespace": "nova",
"nova_object.name": "KeypairPayload",
"nova_object.data": {
"user_id": "fake",
"name": "my-key",
"fingerprint": "1e:2c:9b:56:79:4b:45:77:f9:ca:7a:98:2c:b0:d5:3c",
"public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova",
"type": "ssh"
}
}
],
"tags": ["tag"],
"trusted_image_certificates": [
"cert-id-1",
"cert-id-2"
],
"instance_name": "instance-00000001"
},
"nova_object.name":"InstanceCreatePayload",
"nova_object.version": "1.12"
"$ref": "InstanceActionPayload.json",
"nova_object.data": {
"block_devices": [],
"keypairs": [
{
"nova_object.version": "1.0",
"nova_object.namespace": "nova",
"nova_object.name": "KeypairPayload",
"nova_object.data": {
"user_id": "fake",
"name": "my-key",
"fingerprint": "1e:2c:9b:56:79:4b:45:77:f9:ca:7a:98:2c:b0:d5:3c",
"public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova",
"type": "ssh"
}
}
],
"tags": ["tag"],
"trusted_image_certificates": ["cert-id-1", "cert-id-2"],
"instance_name": "instance-00000001"
},
"nova_object.name": "InstanceCreatePayload",
"nova_object.version": "1.13"
}
doc/notification_samples/common_payloads/InstanceExistsPayload.json
+7 -5
View File
@@ -1,9 +1,11 @@
{
"$ref": "InstancePayload.json",
"nova_object.data":{
"audit_period": {"$ref": "AuditPeriodPayload.json#"}
"nova_object.data": {
"audit_period": {
"$ref": "AuditPeriodPayload.json#"
}
},
"nova_object.name":"InstanceExistsPayload",
"nova_object.namespace":"nova",
"nova_object.version":"2.0"
"nova_object.name": "InstanceExistsPayload",
"nova_object.namespace": "nova",
"nova_object.version": "2.1"
}
doc/notification_samples/common_payloads/InstancePayload.json
+3 -2
View File
@@ -38,9 +38,10 @@
"request_id": "req-5b6c791d-5709-4f36-8fbe-c3e02869e35d",
"action_initiator_user": "fake",
"action_initiator_project": "6f70656e737461636b20342065766572",
"locked_reason": null
"locked_reason": null,
"shares": []
},
"nova_object.name":"InstancePayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.8"
"nova_object.version":"1.9"
}
doc/notification_samples/common_payloads/InstancePayloadShareActive.json
+57
View File
@@ -0,0 +1,57 @@
{
"nova_object.data": {
"architecture": "x86_64",
"availability_zone": "nova",
"block_devices": [
{
"$ref": "BlockDevicePayload.json#"
}
],
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_name": "some-server",
"display_description": "some-server",
"host": "compute",
"host_name": "some-server",
"ip_addresses": [
{
"$ref": "IpPayload.json#"
}
],
"kernel_id": "",
"key_name": "my-key",
"launched_at": "2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"metadata": {},
"locked": false,
"node": "fake-mini",
"os_type": null,
"progress": 0,
"ramdisk_id": "",
"reservation_id": "r-npxv0e40",
"state": "active",
"task_state": null,
"power_state": "running",
"tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null,
"auto_disk_config": "MANUAL",
"flavor": {
"$ref": "FlavorPayload.json#"
},
"updated_at": "2012-10-29T13:42:11Z",
"user_id": "fake",
"uuid": "178b0921-8f85-4257-88b6-2e743b5a975c",
"request_id": "req-5b6c791d-5709-4f36-8fbe-c3e02869e35d",
"action_initiator_user": "fake",
"action_initiator_project": "6f70656e737461636b20342065766572",
"locked_reason": null,
"shares": [
{
"$ref": "ShareActivePayload.json#"
}
]
},
"nova_object.name": "InstancePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.9"
}
doc/notification_samples/common_payloads/InstancePayloadShareInactive.json
+57
View File
@@ -0,0 +1,57 @@
{
"nova_object.data": {
"architecture": "x86_64",
"availability_zone": "nova",
"block_devices": [
{
"$ref": "BlockDevicePayload.json#"
}
],
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_name": "some-server",
"display_description": "some-server",
"host": "compute",
"host_name": "some-server",
"ip_addresses": [
{
"$ref": "IpPayload.json#"
}
],
"kernel_id": "",
"key_name": "my-key",
"launched_at": "2012-10-29T13:42:11Z",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"metadata": {},
"locked": false,
"node": "fake-mini",
"os_type": null,
"progress": 0,
"ramdisk_id": "",
"reservation_id": "r-npxv0e40",
"state": "active",
"task_state": null,
"power_state": "running",
"tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null,
"auto_disk_config": "MANUAL",
"flavor": {
"$ref": "FlavorPayload.json#"
},
"updated_at": "2012-10-29T13:42:11Z",
"user_id": "fake",
"uuid": "178b0921-8f85-4257-88b6-2e743b5a975c",
"request_id": "req-5b6c791d-5709-4f36-8fbe-c3e02869e35d",
"action_initiator_user": "fake",
"action_initiator_project": "6f70656e737461636b20342065766572",
"locked_reason": null,
"shares": [
{
"$ref": "ShareInactivePayload.json#"
}
]
},
"nova_object.name": "InstancePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.9"
}
doc/notification_samples/common_payloads/InstanceUpdatePayload.json
+29 -29
View File
@@ -1,32 +1,32 @@
{
"$ref": "InstancePayload.json",
"nova_object.data": {
"audit_period": {
"nova_object.data": {
"audit_period_beginning": "2012-10-01T00:00:00Z",
"audit_period_ending": "2012-10-29T13:42:11Z"
},
"nova_object.name": "AuditPeriodPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
},
"block_devices": [],
"old_display_name": null,
"state_update": {
"nova_object.data": {
"new_task_state": null,
"old_state": "active",
"old_task_state": null,
"state": "active"
},
"nova_object.name": "InstanceStateUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
},
"tags": [],
"updated_at": "2012-10-29T13:42:11Z"
"$ref": "InstancePayload.json",
"nova_object.data": {
"audit_period": {
"nova_object.data": {
"audit_period_beginning": "2012-10-01T00:00:00Z",
"audit_period_ending": "2012-10-29T13:42:11Z"
},
"nova_object.name": "AuditPeriodPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "2.0"
"block_devices": [],
"old_display_name": null,
"state_update": {
"nova_object.data": {
"new_task_state": null,
"old_state": "active",
"old_task_state": null,
"state": "active"
},
"nova_object.name": "InstanceStateUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
},
"tags": [],
"updated_at": "2012-10-29T13:42:11Z"
},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "2.1"
}
doc/notification_samples/common_payloads/ShareActivePayload.json
+12
View File
@@ -0,0 +1,12 @@
{
"nova_object.data": {
"share_mapping_uuid": "f7c1726d-7622-42b3-8b2c-4473239d60d1",
"export_location": "10.0.0.50:/mnt/foo",
"share_id": "e8debdc0-447a-4376-a10a-4cd9122d7986",
"status": "active",
"tag": "e8debdc0-447a-4376-a10a-4cd9122d7986"
},
"nova_object.name": "SharePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}
doc/notification_samples/common_payloads/ShareInactivePayload.json
+12
View File
@@ -0,0 +1,12 @@
{
"nova_object.data": {
"share_mapping_uuid": "f7c1726d-7622-42b3-8b2c-4473239d60d1",
"export_location": "10.0.0.50:/mnt/foo",
"share_id": "e8debdc0-447a-4376-a10a-4cd9122d7986",
"status": "inactive",
"tag": "e8debdc0-447a-4376-a10a-4cd9122d7986"
},
"nova_object.name": "SharePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}
doc/notification_samples/instance-power_on_share-end.json
+8
View File
@@ -0,0 +1,8 @@
{
"event_type": "instance.power_on.end",
"payload": {
"$ref": "common_payloads/InstanceActionPayloadShareActive.json#"
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"
}
doc/notification_samples/instance-power_on_share-start.json
+13
View File
@@ -0,0 +1,13 @@
{
"event_type": "instance.power_on.start",
"payload": {
"$ref": "common_payloads/InstanceActionPayloadShareInactive.json#",
"nova_object.data": {
"task_state": "powering-on",
"state": "stopped",
"power_state": "shutdown"
}
},
"priority": "INFO",
"publisher_id": "nova-compute:compute"
}