From a7c3108bf78d2f48b48876a491ecbc69a7ce984f Mon Sep 17 00:00:00 2001
From: Takashi NATSUME <natsume.takashi@lab.ntt.co.jp>
Date: Fri, 4 Oct 2019 11:37:55 +0900
Subject: [PATCH] api-ref: Fix security groups parameters

The security groups parameters are optional
in the response of the following APIs.

- GET /servers/detail
- GET /servers/{server_id}
- PUT /servers/{server_id}
- POST /servers/{server_id}/action (rebuild)

So fix them.

Change-Id: Icc2315fd8b8c085de9d560de6ddf4c05aaaf6acb
Closes-Bug: #1846656
---
 api-ref/source/parameters.yaml | 8 +++++++-
 api-ref/source/servers.inc     | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 2a0858f09ab6..824059dd4f9f 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -6046,11 +6046,17 @@ security_groups_obj:
   in: body
   required: true
   type: array
+security_groups_obj_optional:
+  description: |
+    One or more security groups objects.
+  in: body
+  required: false
+  type: array
 security_groups_obj_update_rebuild:
   description: |
     One or more security groups objects.
   in: body
-  required: true
+  required: false
   type: array
   min_version: 2.75
 security_groups_quota:
diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc
index ced90e5304fc..8921e93eb70e 100644
--- a/api-ref/source/servers.inc
+++ b/api-ref/source/servers.inc
@@ -634,8 +634,6 @@ Response
   - os-extended-volumes:volumes_attached.delete_on_termination: os-extended-volumes:volumes_attached.delete_on_termination
   - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at
   - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at
-  - security_groups: security_groups_obj
-  - security_group.name: name
   - status: server_status
   - tenant_id: tenant_id_body
   - updated: updated
@@ -646,6 +644,8 @@ Response
   - fault.message: fault_message
   - fault.details: fault_details
   - progress: progress
+  - security_groups: security_groups_obj_optional
+  - security_group.name: name
   - servers_links: servers_links
   - OS-EXT-SRV-ATTR:hostname: server_hostname
   - OS-EXT-SRV-ATTR:reservation_id: server_reservation_id
@@ -758,8 +758,6 @@ Response
   - os-extended-volumes:volumes_attached.delete_on_termination: os-extended-volumes:volumes_attached.delete_on_termination
   - OS-SRV-USG:launched_at: OS-SRV-USG:launched_at
   - OS-SRV-USG:terminated_at: OS-SRV-USG:terminated_at
-  - security_groups: security_groups_obj
-  - security_group.name: name
   - status: server_status
   - tenant_id: tenant_id_body
   - updated: updated
@@ -770,6 +768,8 @@ Response
   - fault.message: fault_message
   - fault.details: fault_details
   - progress: progress
+  - security_groups: security_groups_obj_optional
+  - security_group.name: name
   - OS-EXT-SRV-ATTR:hostname: server_hostname
   - OS-EXT-SRV-ATTR:reservation_id: server_reservation_id
   - OS-EXT-SRV-ATTR:launch_index: server_launch_index