openstack/nova
Code Issues Proposed changes

Revert "Deduplicate service status notification samples"

Browse Source 
This reverts commit 39f9ef719e.

The reverted change made the service.update notification sample tests
failing consistently on master. The CI did not catch this problem as
the functional test does not run for changes that only touches
nova/docs. This is a quick fix to unblock the gate and fix the
functional job defintion in a separate patch.

Change-Id: Idabbf70ae46f36be8343c0a00d812cbebf7f7670
Closes-Bug: #1742935
This commit is contained in:
Balazs Gibizer
2018-01-12 15:11:35 +01:00
parent 2f128404d0
commit 3881f9e1ef
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
doc/notification_samples/common_payloads/ServiceStatusPayload.json
View File

@@ -1,18 +0,0 @@
{
"nova_object.name": "ServiceStatusPayload",
"nova_object.namespace": "nova",
"nova_object.version": "1.1",
"nova_object.data": {
"host": "host2",
"disabled": false,
"binary": "nova-compute",
"topic": "compute",
"disabled_reason": null,
"forced_down": false,
"version": 23,
"availability_zone": null,
"uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73",
"last_seen_up": null,
"report_count": 0
}
}

17
doc/notification_samples/service-create.json
View File

@@ -1,7 +1,22 @@
{
"priority": "INFO",
"payload": {
"$ref": "common_payloads/ServiceStatusPayload.json#"
"nova_object.namespace": "nova",
"nova_object.name": "ServiceStatusPayload",
"nova_object.version": "1.1",
"nova_object.data": {
"host": "host2",
"disabled": false,
"last_seen_up": null,
"binary": "nova-compute",
"topic": "compute",
"disabled_reason": null,
"report_count": 0,
"forced_down": false,
"version": 23,
"availability_zone": null,
"uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73"
}
},
"event_type": "service.create",
"publisher_id": "nova-compute:host2"

17
doc/notification_samples/service-delete.json
View File

@@ -1,7 +1,22 @@
{
"priority": "INFO",
"payload": {
"$ref": "common_payloads/ServiceStatusPayload.json#"
"nova_object.namespace": "nova",
"nova_object.name": "ServiceStatusPayload",
"nova_object.version": "1.1",
"nova_object.data": {
"host": "host2",
"disabled": false,
"last_seen_up": null,
"binary": "nova-compute",
"topic": "compute",
"disabled_reason": null,
"report_count": 0,
"forced_down": false,
"version": 23,
"availability_zone": null,
"uuid": "32887c0a-5063-4d39-826f-4903c241c376"
}
},
"event_type": "service.delete",
"publisher_id": "nova-compute:host2"

15
doc/notification_samples/service-update.json
View File

@@ -1,10 +1,21 @@
{
"priority": "INFO",
"payload": {
"$ref": "common_payloads/ServiceStatusPayload.json#",
"nova_object.namespace": "nova",
"nova_object.name": "ServiceStatusPayload",
"nova_object.version": "1.1",
"nova_object.data": {
"host": "host1",
"disabled": false,
"last_seen_up": "2012-10-29T13:42:05Z",
"report_count": 1
"binary": "nova-compute",
"topic": "compute",
"disabled_reason": null,
"report_count": 1,
"forced_down": false,
"version": 23,
"availability_zone": null,
"uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73"
}
},
"event_type": "service.update",