From de9ce26c7385d88398f2d9c4e3d4a57c97c3a95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= Date: Mon, 20 Nov 2017 16:30:21 +0100 Subject: [PATCH] Deduplicate keypair notification samples This patch refactors the sample files of keypair-create, keypair-delete and keypair-import notifications to use a common KeypairPayload sample data. Change-Id: Ic8f2d51fe4922cd7633b0d77dc86702798bae1d6 --- .../common_payloads/KeypairPayload.json | 12 ++++++++++++ doc/notification_samples/keypair-create-end.json | 13 +------------ doc/notification_samples/keypair-create-start.json | 9 ++------- doc/notification_samples/keypair-delete-end.json | 13 +------------ doc/notification_samples/keypair-delete-start.json | 13 +------------ doc/notification_samples/keypair-import-end.json | 13 +------------ doc/notification_samples/keypair-import-start.json | 10 ++-------- 7 files changed, 20 insertions(+), 63 deletions(-) create mode 100644 doc/notification_samples/common_payloads/KeypairPayload.json diff --git a/doc/notification_samples/common_payloads/KeypairPayload.json b/doc/notification_samples/common_payloads/KeypairPayload.json new file mode 100644 index 000000000000..92484e093f31 --- /dev/null +++ b/doc/notification_samples/common_payloads/KeypairPayload.json @@ -0,0 +1,12 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/doc/notification_samples/keypair-create-end.json b/doc/notification_samples/keypair-create-end.json index 52ac6cb9fb43..b0aef337d456 100644 --- a/doc/notification_samples/keypair-create-end.json +++ b/doc/notification_samples/keypair-create-end.json @@ -1,17 +1,6 @@ { "priority": "INFO", - "payload": { - "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" - } - }, + "payload": {"$ref": "common_payloads/KeypairPayload.json#"}, "event_type": "keypair.create.end", "publisher_id": "nova-api:fake-mini" } diff --git a/doc/notification_samples/keypair-create-start.json b/doc/notification_samples/keypair-create-start.json index ccf4d9a90989..a9770c99dff0 100644 --- a/doc/notification_samples/keypair-create-start.json +++ b/doc/notification_samples/keypair-create-start.json @@ -1,15 +1,10 @@ { "priority": "INFO", "payload": { - "nova_object.version": "1.0", - "nova_object.namespace": "nova", - "nova_object.name": "KeypairPayload", + "$ref": "common_payloads/KeypairPayload.json#", "nova_object.data": { - "user_id": "fake", - "name": "my-key", "fingerprint": null, - "public_key": null, - "type": "ssh" + "public_key": null } }, "event_type": "keypair.create.start", diff --git a/doc/notification_samples/keypair-delete-end.json b/doc/notification_samples/keypair-delete-end.json index 2ae248829135..18551ca3b65c 100644 --- a/doc/notification_samples/keypair-delete-end.json +++ b/doc/notification_samples/keypair-delete-end.json @@ -1,17 +1,6 @@ { "priority": "INFO", - "payload": { - "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" - } - }, + "payload": {"$ref": "common_payloads/KeypairPayload.json#"}, "event_type": "keypair.delete.end", "publisher_id": "nova-api:fake-mini" } \ No newline at end of file diff --git a/doc/notification_samples/keypair-delete-start.json b/doc/notification_samples/keypair-delete-start.json index 393ef63646bc..d6b7147a161a 100644 --- a/doc/notification_samples/keypair-delete-start.json +++ b/doc/notification_samples/keypair-delete-start.json @@ -1,17 +1,6 @@ { "priority": "INFO", - "payload": { - "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" - } - }, + "payload": {"$ref": "common_payloads/KeypairPayload.json#"}, "event_type": "keypair.delete.start", "publisher_id": "nova-api:fake-mini" } \ No newline at end of file diff --git a/doc/notification_samples/keypair-import-end.json b/doc/notification_samples/keypair-import-end.json index 03fbbedeb1e8..8ecac2634d57 100644 --- a/doc/notification_samples/keypair-import-end.json +++ b/doc/notification_samples/keypair-import-end.json @@ -1,17 +1,6 @@ { "priority": "INFO", - "payload": { - "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" - } - }, + "payload": {"$ref": "common_payloads/KeypairPayload.json#"}, "event_type": "keypair.import.end", "publisher_id": "nova-api:fake-mini" } \ No newline at end of file diff --git a/doc/notification_samples/keypair-import-start.json b/doc/notification_samples/keypair-import-start.json index 444aa600a138..0b0f7c724c47 100644 --- a/doc/notification_samples/keypair-import-start.json +++ b/doc/notification_samples/keypair-import-start.json @@ -1,15 +1,9 @@ { "priority": "INFO", "payload": { - "nova_object.version": "1.0", - "nova_object.namespace": "nova", - "nova_object.name": "KeypairPayload", + "$ref": "common_payloads/KeypairPayload.json#", "nova_object.data": { - "user_id": "fake", - "name": "my-key", - "fingerprint": null, - "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova", - "type": "ssh" + "fingerprint": null } }, "event_type": "keypair.import.start",