openstack/nova
Code Issues Proposed changes

Deduplicate notification samples Rocky - 7

Browse Source 
This patch refactors the sample files of:

* instance-update
* instance-update-tags

notifications to use a common InstanceUpdatePayload sample data.

Change-Id: I8720556ed8a9ce7f1db165a793fbb7070954cc5a
This commit is contained in:
Kevin_Zheng 2018-04-12 12:00:52 +08:00
parent 324899c621
commit 586a18ab32
5 changed files with 89 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doc/notification_samples/common_payloads/InstanceActionPayload.json
View File

@ -1,41 +1,7 @@
{
"$ref": "InstancePayload.json",
"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",
"fault":null,
"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"
"fault":null
},
"nova_object.name":"InstanceActionPayload",
"nova_object.namespace":"nova",

42
doc/notification_samples/common_payloads/InstancePayload.json Normal file
View File

@ -0,0 +1,42 @@
{
"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"
},
"nova_object.name":"InstancePayload",
"nova_object.namespace":"nova",
"nova_object.version":"1.5"
}

33
doc/notification_samples/common_payloads/InstanceUpdatePayload.json Normal file
View File

@ -0,0 +1,33 @@
{
"$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"
},
"bandwidth": [],
"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": "1.6"
}

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

@ -1,95 +1,11 @@
{
"event_type": "instance.update",
"payload": {
"$ref":"common_payloads/InstanceUpdatePayload.json#",
"nova_object.data": {
"architecture": "x86_64",
"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"},
"auto_disk_config": "MANUAL",
"availability_zone": "nova",
"block_devices": [],
"bandwidth": [],
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_description": "some-server",
"display_name": "some-server",
"flavor": {
"nova_object.data": {
"disabled": false,
"ephemeral_gb": 0,
"extra_specs": {
"hw:watchdog_action": "disabled"
},
"flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
"is_public": true,
"memory_mb": 512,
"name": "test_flavor",
"projects": null,
"root_gb": 1,
"rxtx_factor": 1.0,
"swap": 0,
"vcpu_weight": 0,
"vcpus": 1,
"description":null},
"nova_object.name": "FlavorPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.4"},
"host": "compute",
"host_name": "some-server",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"ip_addresses": [
{
"nova_object.data": {
"address": "192.168.1.3",
"device_name": "tapce531f90-19",
"label": "private-network",
"mac": "fa:16:3e:4c:2c:30",
"meta": {},
"port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
"version": 4},
"nova_object.name": "IpPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"
}
],
"kernel_id": "",
"key_name": "my-key",
"launched_at": "2012-10-29T13:42:11Z",
"locked": false,
"metadata": {},
"node": "fake-mini",
"old_display_name": null,
"os_type": null,
"power_state": "running",
"progress": 0,
"ramdisk_id": "",
"reservation_id": "r-53ad660s",
"state": "active",
"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": ["tag1"],
"task_state": null,
"tenant_id": "6f70656e737461636b20342065766572",
"terminated_at": null,
"user_id": "fake",
"uuid": "d5ca7280-1f12-4238-a86f-378bb5d93c38",
"updated_at": "2012-10-29T13:42:11Z"
},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.6"},
"tags": ["tag1"]
}
},
"priority": "INFO",
"publisher_id": "nova-api:fake-mini"
}

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

@ -1,84 +1,22 @@
{
"event_type": "instance.update",
"payload": {
"$ref":"common_payloads/InstanceUpdatePayload.json#",
"nova_object.data": {
"architecture": "x86_64",
"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"
},
"availability_zone": "nova",
"block_devices": [],
"bandwidth": [],
"created_at": "2012-10-29T13:42:11Z",
"deleted_at": null,
"display_name": "some-server",
"display_description":"some-server",
"host": "compute",
"host_name": "some-server",
"image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
"key_name": "my-key",
"kernel_id": "",
"launched_at": null,
"metadata": {},
"locked":false,
"node": "fake-mini",
"old_display_name": null,
"os_type": null,
"progress": 0,
"ramdisk_id": "",
"reservation_id": "r-sd3ygfjj",
"state": "building",
"task_state": "scheduling",
"power_state": "pending",
"ip_addresses": [],
"updated_at": null,
"power_state": "pending",
"launched_at": null,
"task_state": "scheduling",
"state_update": {
"nova_object.data": {
"new_task_state": null,
"old_state": "building",
"old_task_state": null,
"state": "building"},
"nova_object.name": "InstanceStateUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.0"},
"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"
},
"tags": [],
"user_id": "fake",
"uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2",
"updated_at": null
},
"nova_object.name": "InstanceUpdatePayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.6"},
"nova_object.version": "1.0"}
}
},
"priority": "INFO",
"publisher_id": "nova-compute:fake-mini"
}