From 37c618da7c565b13cf6779f40c41ce895ff0459f Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 5 Mar 2013 16:17:29 -0500
Subject: Make os-services API extensions consistent.

Updates the os-services API extension so that it is consistent
internally (index and update return similar formats), and so
that it works with the recent novaclient code which sends
the following request body format:

  {"binary": "nova-cert", "host": "nova1"}

Also, updates the response body format of the update call so that it
wraps things in an extra service dict which should make novaclient
happier here as well (and is consistent with other extensions too).

Fixes LP Bug #1147746.

Change-Id: I932160d64fdd3aaeb2ed90a092ecc7a36dcc9665
---
 doc/api_samples/os-services/service-disable-put-req.json  |  4 ++--
 doc/api_samples/os-services/service-disable-put-resp.json | 10 ++++++----
 doc/api_samples/os-services/service-enable-put-resp.json  | 10 ++++++----
 doc/api_samples/os-services/services-list-get-resp.json   |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/doc/api_samples/os-services/service-disable-put-req.json b/doc/api_samples/os-services/service-disable-put-req.json
index d11afaed9..f96d34536 100644
--- a/doc/api_samples/os-services/service-disable-put-req.json
+++ b/doc/api_samples/os-services/service-disable-put-req.json
@@ -1,4 +1,4 @@
 {
     "host": "host1",
-    "service": "nova-compute"
-}
\ No newline at end of file
+    "binary": "nova-compute"
+}
diff --git a/doc/api_samples/os-services/service-disable-put-resp.json b/doc/api_samples/os-services/service-disable-put-resp.json
index 2e461bc6d..2c21c547f 100644
--- a/doc/api_samples/os-services/service-disable-put-resp.json
+++ b/doc/api_samples/os-services/service-disable-put-resp.json
@@ -1,5 +1,7 @@
 {
-    "disabled": true,
-    "host": "host1",
-    "service": "nova-compute"
-}
\ No newline at end of file
+    "service": {
+        "host": "host1",
+        "binary": "nova-compute",
+        "status": "disabled"
+    }
+}
diff --git a/doc/api_samples/os-services/service-enable-put-resp.json b/doc/api_samples/os-services/service-enable-put-resp.json
index 88b9dc7f9..75c4ebd55 100644
--- a/doc/api_samples/os-services/service-enable-put-resp.json
+++ b/doc/api_samples/os-services/service-enable-put-resp.json
@@ -1,5 +1,7 @@
 {
-    "disabled": false,
-    "host": "host1",
-    "service": "nova-compute"
-}
\ No newline at end of file
+    "service": {
+        "host": "host1",
+        "binary": "nova-compute",
+        "status": "enabled"
+    }
+}
diff --git a/doc/api_samples/os-services/services-list-get-resp.json b/doc/api_samples/os-services/services-list-get-resp.json
index dcda1a46e..572d5d863 100644
--- a/doc/api_samples/os-services/services-list-get-resp.json
+++ b/doc/api_samples/os-services/services-list-get-resp.json
@@ -33,4 +33,4 @@
             "zone": "nova"
         }
     ]
-}
\ No newline at end of file
+}
-- 
cgit