From 1278b1fe44ab43cd5c766dd669e324404034a67a Mon Sep 17 00:00:00 2001
From: Takashi NATSUME <natsume.takashi@lab.ntt.co.jp>
Date: Wed, 28 Dec 2016 16:06:58 +0900
Subject: [PATCH] api-ref: Fix parameters in os-server-groups.inc

Fix the following parameters.

- 'id'(server group id) defined as a path parameter in body
- 'server_group' object defined as 'server_groups' list
- missing 'server_group' object
- 'user_id' defined as a query parameter in body

Change-Id: I3dcf6aa317b428d6984b0dcb61496594a68bba6f
Closes-Bug: #1652897
---
 api-ref/source/os-server-groups.inc | 11 ++++++-----
 api-ref/source/parameters.yaml      | 26 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/api-ref/source/os-server-groups.inc b/api-ref/source/os-server-groups.inc
index 2ce0e1ebf9..e3d210a903 100644
--- a/api-ref/source/os-server-groups.inc
+++ b/api-ref/source/os-server-groups.inc
@@ -34,7 +34,7 @@ Response
 .. rest_parameters:: parameters.yaml
 
   - server_groups: server_groups_list
-  - id: server_group_id
+  - id: server_group_id_body
   - name: name_server_group
   - policies: policies
   - members: members
@@ -63,6 +63,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+  - server_group: server_group
   - name: name_server_group
   - policies: policies
 
@@ -76,8 +77,8 @@ Response
 
 .. rest_parameters:: parameters.yaml
 
-  - server_groups: server_groups_list
-  - id: server_group_id
+  - server_group: server_group
+  - id: server_group_id_body
   - name: name_server_group
   - policies: policies
   - members: members
@@ -113,8 +114,8 @@ Response
 
 .. rest_parameters:: parameters.yaml
 
-  - server_groups: server_groups_list
-  - id: server_group_id
+  - server_group: server_group
+  - id: server_group_id_body
   - name: name_server_group
   - policies: policies
   - members: members
diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 2eb414caef..2e887cecf4 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -754,13 +754,6 @@ user_id_query_set_quota:
   in: query
   required: false
   type: string
-user_id_server_group:
-  description: |
-    The user ID who owns the server group.
-  min_version: 2.13
-  in: query
-  required: false
-  type: string
 
 # variables in body
 accessIPv4:
@@ -3888,6 +3881,18 @@ server_description:
     A free form description of the server. Limited to 255 characters
     in length. Before microversion 2.19 this was set to the server
     name.
+server_group:
+  description: |
+    The server group obejct.
+  in: body
+  required: true
+  type: object
+server_group_id_body:
+  description: |
+    The UUID of the server group.
+  in: body
+  required: true
+  type: string
 server_group_members:
   description: |
     The number of allowed members for each server group.
@@ -4452,6 +4457,13 @@ user_id:
   in: body
   required: true
   type: string
+user_id_server_group:
+  description: |
+    The user ID who owns the server group.
+  min_version: 2.13
+  in: body
+  required: false
+  type: string
 vcpus:
   description: |
     The number of virtual CPUs that the server uses.