From 71ee33c124a19c7e88bf4f0af17e45a4e6a42c6c Mon Sep 17 00:00:00 2001
From: Kevin_Zheng <zhengzhenyu@huawei.com>
Date: Thu, 12 Apr 2018 11:16:30 +0800
Subject: [PATCH] Deduplicate notification samples Rocky - 3

This patch refactors the sample files of:

* instance-shelve-start
* instance-shelve-end
* instance-shelve_offload-start
* instance-shelve_offload-end
* instance-unshelve-start
* instance-unshelve-end

notifications to use a common InstanceActionPayload sample data.

Change-Id: Ic64f89d33a985cf6121ddc198380902a5e936ec4
---
 .../instance-shelve-end.json                  | 86 +-----------------
 .../instance-shelve-start.json                | 85 +-----------------
 .../instance-shelve_offload-end.json          | 88 ++----------------
 .../instance-shelve_offload-start.json        | 87 ++----------------
 .../instance-unshelve-end.json                | 84 +----------------
 .../instance-unshelve-start.json              | 89 ++-----------------
 6 files changed, 26 insertions(+), 493 deletions(-)

diff --git a/doc/notification_samples/instance-shelve-end.json b/doc/notification_samples/instance-shelve-end.json
index 5c3db4308adb..da0a145c47b8 100644
--- a/doc/notification_samples/instance-shelve-end.json
+++ b/doc/notification_samples/instance-shelve-end.json
@@ -1,89 +1,11 @@
 {
     "event_type":"instance.shelve.end",
     "payload":{
+        "$ref": "common_payloads/InstanceActionPayload.json#",
         "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":"compute",
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "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":"shelved",
-            "task_state":null,
-            "power_state":"shutdown",
-            "tenant_id":"6f70656e737461636b20342065766572",
-            "terminated_at":null,
-            "auto_disk_config":"MANUAL",
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+            "state": "shelved",
+            "power_state": "shutdown"
+        }
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
diff --git a/doc/notification_samples/instance-shelve-start.json b/doc/notification_samples/instance-shelve-start.json
index 99cf09769cd4..f2870a5d79dd 100644
--- a/doc/notification_samples/instance-shelve-start.json
+++ b/doc/notification_samples/instance-shelve-start.json
@@ -1,89 +1,10 @@
 {
     "event_type":"instance.shelve.start",
     "payload":{
+        "$ref": "common_payloads/InstanceActionPayload.json#",
         "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":"compute",
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "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":"shelving",
-            "power_state":"running",
-            "tenant_id":"6f70656e737461636b20342065766572",
-            "terminated_at":null,
-            "auto_disk_config":"MANUAL",
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+            "task_state": "shelving"
+        }
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
diff --git a/doc/notification_samples/instance-shelve_offload-end.json b/doc/notification_samples/instance-shelve_offload-end.json
index 90114e480526..d7a563557cf4 100644
--- a/doc/notification_samples/instance-shelve_offload-end.json
+++ b/doc/notification_samples/instance-shelve_offload-end.json
@@ -1,89 +1,13 @@
 {
     "event_type":"instance.shelve_offload.end",
     "payload":{
+        "$ref": "common_payloads/InstanceActionPayload.json#",
         "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":null,
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "launched_at":"2012-10-29T13:42:11Z",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "metadata":{},
-            "locked":false,
-            "node":null,
-            "os_type":null,
-            "progress":0,
-            "ramdisk_id":"",
-            "reservation_id":"r-npxv0e40",
-            "state":"shelved_offloaded",
-            "task_state":null,
-            "power_state":"shutdown",
-            "tenant_id":"6f70656e737461636b20342065766572",
-            "terminated_at":null,
-            "auto_disk_config":"MANUAL",
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+            "state": "shelved_offloaded",
+            "power_state": "shutdown",
+            "host": null,
+            "node": null
+        }
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
diff --git a/doc/notification_samples/instance-shelve_offload-start.json b/doc/notification_samples/instance-shelve_offload-start.json
index b1b3e019b969..26717114d88d 100644
--- a/doc/notification_samples/instance-shelve_offload-start.json
+++ b/doc/notification_samples/instance-shelve_offload-start.json
@@ -1,89 +1,12 @@
 {
     "event_type":"instance.shelve_offload.start",
     "payload":{
+        "$ref": "common_payloads/InstanceActionPayload.json#",
         "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":"compute",
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "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":"shelved",
-            "task_state":"shelving_offloading",
-            "power_state":"shutdown",
-            "tenant_id":"6f70656e737461636b20342065766572",
-            "terminated_at":null,
-            "auto_disk_config":"MANUAL",
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+            "state": "shelved",
+            "task_state": "shelving_offloading",
+            "power_state": "shutdown"
+        }
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
diff --git a/doc/notification_samples/instance-unshelve-end.json b/doc/notification_samples/instance-unshelve-end.json
index 1eeb9e3c13de..f599b48b37fb 100644
--- a/doc/notification_samples/instance-unshelve-end.json
+++ b/doc/notification_samples/instance-unshelve-end.json
@@ -1,89 +1,7 @@
 {
     "event_type":"instance.unshelve.end",
     "payload":{
-        "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":"compute",
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "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": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+        "$ref": "common_payloads/InstanceActionPayload.json#"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
diff --git a/doc/notification_samples/instance-unshelve-start.json b/doc/notification_samples/instance-unshelve-start.json
index 3b71b7fb6a17..adc43e393b27 100644
--- a/doc/notification_samples/instance-unshelve-start.json
+++ b/doc/notification_samples/instance-unshelve-start.json
@@ -1,89 +1,14 @@
 {
     "event_type":"instance.unshelve.start",
     "payload":{
+        "$ref": "common_payloads/InstanceActionPayload.json#",
         "nova_object.data":{
-            "architecture":"x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at":"2012-10-29T13:42:11Z",
-            "deleted_at":null,
-            "display_name":"some-server",
-            "display_description":"some-server",
-            "fault":null,
-            "host":null,
-            "host_name":"some-server",
-            "ip_addresses": [{
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0",
-                "nova_object.data": {
-                    "mac": "fa:16:3e:4c:2c:30",
-                    "address": "192.168.1.3",
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "meta": {},
-                    "version": 4,
-                    "label": "private-network",
-                    "device_name": "tapce531f90-19"
-                }
-            }],
-            "key_name": "my-key",
-            "kernel_id":"",
-            "launched_at":"2012-10-29T13:42:11Z",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "metadata":{},
-            "locked":false,
-            "node":null,
-            "os_type":null,
-            "progress":0,
-            "ramdisk_id":"",
-            "reservation_id":"r-npxv0e40",
-            "state":"shelved_offloaded",
-            "task_state":"unshelving",
-            "power_state":"shutdown",
-            "tenant_id":"6f70656e737461636b20342065766572",
-            "terminated_at":null,
-            "auto_disk_config":"MANUAL",
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "user_id":"fake",
-            "uuid":"178b0921-8f85-4257-88b6-2e743b5a975c",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name":"InstanceActionPayload",
-        "nova_object.namespace":"nova",
-        "nova_object.version":"1.5"
+            "state": "shelved_offloaded",
+            "power_state": "shutdown",
+            "task_state": "unshelving",
+            "host": null,
+            "node": null
+        }
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"