From 3881f9e1efe9183232c6273732a344ff2f9e2021 Mon Sep 17 00:00:00 2001
From: Balazs Gibizer <balazs.gibizer@ericsson.com>
Date: Fri, 12 Jan 2018 15:11:35 +0100
Subject: [PATCH] Revert "Deduplicate service status notification samples"

This reverts commit 39f9ef719eacb2fbcf0c37680b845152fcff01cc.

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
---
 .../common_payloads/ServiceStatusPayload.json  | 18 ------------------
 doc/notification_samples/service-create.json   | 17 ++++++++++++++++-
 doc/notification_samples/service-delete.json   | 17 ++++++++++++++++-
 doc/notification_samples/service-update.json   | 15 +++++++++++++--
 4 files changed, 45 insertions(+), 22 deletions(-)
 delete mode 100644 doc/notification_samples/common_payloads/ServiceStatusPayload.json

diff --git a/doc/notification_samples/common_payloads/ServiceStatusPayload.json b/doc/notification_samples/common_payloads/ServiceStatusPayload.json
deleted file mode 100644
index 3a8d0c4f3fd0..000000000000
--- a/doc/notification_samples/common_payloads/ServiceStatusPayload.json
+++ /dev/null
@@ -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
-    }
-}
diff --git a/doc/notification_samples/service-create.json b/doc/notification_samples/service-create.json
index 1145647f87e1..3855b1e5a15c 100644
--- a/doc/notification_samples/service-create.json
+++ b/doc/notification_samples/service-create.json
@@ -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"
diff --git a/doc/notification_samples/service-delete.json b/doc/notification_samples/service-delete.json
index eb37ab54ce09..02d2623d5c89 100644
--- a/doc/notification_samples/service-delete.json
+++ b/doc/notification_samples/service-delete.json
@@ -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"
diff --git a/doc/notification_samples/service-update.json b/doc/notification_samples/service-update.json
index 28f5f8697bf7..dedb9389f4b4 100644
--- a/doc/notification_samples/service-update.json
+++ b/doc/notification_samples/service-update.json
@@ -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",