From f762bc54e5e8c00893f6092ddc6f9d72526148ea Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Wed, 7 Mar 2018 03:22:47 +0000 Subject: [PATCH] Add availability_zone to api-ref Change-Id: Id1dc8b76798d230d1a51e215cfce60edd10842d9 --- api-ref/source/parameters.yaml | 6 +++++ .../samples/container-network-list-resp.json | 18 ++++++------- api-ref/source/samples/service-get-resp.json | 27 ++++++++++--------- api-ref/source/services.inc | 1 + 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index dc226f03e..f018bc60b 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -188,6 +188,12 @@ auto_remove: when the container's process exits. in: body type: boolean +availability_zone: + in: body + type: string + required: true + description: | + The availability zone of the Zun service. binary: in: body type: string diff --git a/api-ref/source/samples/container-network-list-resp.json b/api-ref/source/samples/container-network-list-resp.json index bd7ce7e2c..8dba851ba 100644 --- a/api-ref/source/samples/container-network-list-resp.json +++ b/api-ref/source/samples/container-network-list-resp.json @@ -1,11 +1,11 @@ { - "networks": [ - { - "subnet_id": "ae8d7cce-859e-432f-8a33-d7d8834ccd14", - "port_id": "5be06e49-70dc-4984-94a2-1b946bb136fb", - "version": "ae8d7cce-859e-432f-8a33-d7d8834ccd14", - "ip_address": "30.30.30.10", - "net_id": "7e6b5e1b-9b44-4f55-b4e3-16a1ead98161" - } - ] + "networks": [ + { + "subnet_id": "ae8d7cce-859e-432f-8a33-d7d8834ccd14", + "port_id": "5be06e49-70dc-4984-94a2-1b946bb136fb", + "version": "ae8d7cce-859e-432f-8a33-d7d8834ccd14", + "ip_address": "30.30.30.10", + "net_id": "7e6b5e1b-9b44-4f55-b4e3-16a1ead98161" + } + ] } diff --git a/api-ref/source/samples/service-get-resp.json b/api-ref/source/samples/service-get-resp.json index e80a2726b..9e087367a 100644 --- a/api-ref/source/samples/service-get-resp.json +++ b/api-ref/source/samples/service-get-resp.json @@ -1,17 +1,18 @@ { "services":[ - { - "binary":"zun-compute", - "state":"up", - "created_at":"2017-02-01 03:25:07+00:00", - "updated_at":"2017-02-01 06:13:07+00:00", - "report_count":166, - "disabled":false, - "host":"instance-1", - "forced_down":false, - "last_seen_up":"2017-02-01 06:13:07+00:00", - "disabled_reason":null, - "id": 1 - } + { + "binary": "zun-compute", + "availability_zone": "nova", + "state": "up", + "created_at": "2017-02-01 03:25:07+00:00", + "updated_at": "2017-02-01 06:13:07+00:00", + "report_count": 166, + "disabled": false, + "host": "instance-1", + "forced_down": false, + "last_seen_up": "2017-02-01 06:13:07+00:00", + "disabled_reason": null, + "id": 1 + } ] } diff --git a/api-ref/source/services.inc b/api-ref/source/services.inc index e1dfff3dc..61a0cab34 100644 --- a/api-ref/source/services.inc +++ b/api-ref/source/services.inc @@ -34,6 +34,7 @@ Response Parameters - X-Openstack-Request-Id: request_id - services: services - binary: binary + - availability_zone: availability_zone - created_at: created_at - state: state - report_count: report_count