From 1a2df04f90d5e67628b0899ade08adc4609ce273 Mon Sep 17 00:00:00 2001
From: Lujin Luo <luo.lujin@jp.fujitsu.com>
Date: Thu, 31 Mar 2016 05:56:36 +0900
Subject: [PATCH] Add response parameter and revises JSON examples

In Networking API v2.0 extensions LBaaS v1.0, all response parameter
tables of members miss one response parameter - status_description.
Besides, most of the request and response JSON examples are not
correct. This patch updates these out-of-date/incorrect JSON
examples.

Change-Id: I1267ca2f5a377c572cbaf0e0755f4136fe5367d0
Closes-Bug: #1563663
---
 .../src/wadls/networking-api/src/common.ent   | 10 +++++++++
 .../samples/lbaas/member-create-request.json  |  6 +++---
 .../samples/lbaas/member-create-response.json | 14 +++++++------
 .../samples/lbaas/member-show-response.json   | 14 +++++++------
 .../samples/lbaas/member-update-request.json  |  1 -
 .../samples/lbaas/member-update-response.json | 16 +++++++-------
 .../samples/lbaas/members-list-response.json  | 21 ++++++-------------
 7 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/api-ref/src/wadls/networking-api/src/common.ent b/api-ref/src/wadls/networking-api/src/common.ent
index 1f2c6f30e..1f448a018 100644
--- a/api-ref/src/wadls/networking-api/src/common.ent
+++ b/api-ref/src/wadls/networking-api/src/common.ent
@@ -6088,6 +6088,16 @@
       The status of the member. Indicates whether the member is operational.
     </para>
   </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  required="true"
+  name="status_description" style="plain" type="xsd:string">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+    <para>
+      Human-readable description of the status.
+    </para>
+  </wadl:doc>
 </param>'>
 <!ENTITY memberCreateRequestParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-request.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-request.json
index 3852f09f4..c04504910 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-request.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-request.json
@@ -1,9 +1,9 @@
 {
     "member": {
-        "address": "10.0.0.8",
+        "address": "10.0.0.22",
         "admin_state_up": true,
-        "protocol_port": "80",
-        "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
+        "protocol_port": "90",
+        "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332",
         "weight": "1"
     }
 }
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-response.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-response.json
index cebd9bab8..f26b4dcd3 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-response.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-create-response.json
@@ -1,11 +1,13 @@
 {
     "member": {
-        "address": "10.0.0.8",
         "admin_state_up": true,
-        "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313",
-        "protocol_port": 80,
-        "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
-        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
-        "weight": 1
+        "status": "PENDING_CREATE",
+        "status_description": null,
+        "weight": 1,
+        "address": "10.0.1.22",
+        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
+        "protocol_port": 90,
+        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
+        "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332"
     }
 }
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-show-response.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-show-response.json
index 78d148084..1ec3afee9 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-show-response.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-show-response.json
@@ -1,11 +1,13 @@
 {
     "member": {
-        "address": "10.0.0.8",
         "admin_state_up": true,
-        "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313",
-        "protocol_port": 80,
-        "pool_id": "a5a8839d-1ac3-41f9-9aae-f375fa4da50a",
-        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
-        "weight": 1
+        "status": "ACTIVE",
+        "status_description": null,
+        "weight": 1,
+        "address": "10.0.1.22",
+        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
+        "protocol_port": 90,
+        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
+        "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332"
     }
 }
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-request.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-request.json
index 8f84cd3ba..b5bf2c877 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-request.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-request.json
@@ -1,6 +1,5 @@
 {
     "member": {
-        "admin_state_up": false,
         "weight": 5
     }
 }
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-response.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-response.json
index 1edeb547a..2dced7241 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-response.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/member-update-response.json
@@ -1,11 +1,13 @@
 {
     "member": {
-        "address": "10.0.0.8",
-        "admin_state_up": false,
-        "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313",
-        "protocol_port": 80,
-        "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
-        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
-        "weight": 5
+        "admin_state_up": true,
+        "status": "PENDING_UPDATE",
+        "status_description": null,
+        "weight": 5,
+        "address": "10.0.1.22",
+        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
+        "protocol_port": 90,
+        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
+        "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332"
     }
 }
diff --git a/api-ref/src/wadls/networking-api/src/samples/lbaas/members-list-response.json b/api-ref/src/wadls/networking-api/src/samples/lbaas/members-list-response.json
index 973bd0ca0..62484c8c1 100644
--- a/api-ref/src/wadls/networking-api/src/samples/lbaas/members-list-response.json
+++ b/api-ref/src/wadls/networking-api/src/samples/lbaas/members-list-response.json
@@ -1,24 +1,15 @@
 {
     "members": [
         {
-            "status": "ACTIVE",
-            "weight": 1,
             "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-            "address": "10.0.0.4",
-            "protocol_port": 80,
-            "id": "701b531b-111a-4f21-ad85-4795b7b12af6"
-        },
-        {
             "status": "ACTIVE",
+            "status_description": null,
             "weight": 1,
-            "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-            "address": "10.0.0.3",
-            "protocol_port": 80,
-            "id": "beb53b4d-230b-4abd-8118-575b8fa006ef"
+            "address": "10.0.1.22",
+            "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
+            "protocol_port": 90,
+            "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
+            "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332"
         }
     ]
 }