Merge "Add availability_zone to api-ref"

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

api-ref/source/samples/container-network-list-resp.json

@@ -1,11 +1,11 @@
 {
-  "networks": [
+    "networks": [
-    {
+        {
-      "subnet_id": "ae8d7cce-859e-432f-8a33-d7d8834ccd14",
+            "subnet_id": "ae8d7cce-859e-432f-8a33-d7d8834ccd14",
-      "port_id": "5be06e49-70dc-4984-94a2-1b946bb136fb",
+            "port_id": "5be06e49-70dc-4984-94a2-1b946bb136fb",
-      "version": "ae8d7cce-859e-432f-8a33-d7d8834ccd14",
+            "version": "ae8d7cce-859e-432f-8a33-d7d8834ccd14",
-      "ip_address": "30.30.30.10",
+            "ip_address": "30.30.30.10",
-      "net_id": "7e6b5e1b-9b44-4f55-b4e3-16a1ead98161"
+            "net_id": "7e6b5e1b-9b44-4f55-b4e3-16a1ead98161"
-    }
+        }
-  ]
+    ]
 }

api-ref/source/samples/service-get-resp.json

@@ -1,17 +1,18 @@
 {
     "services":[
-      {
+        {
-        "binary":"zun-compute",
+            "binary": "zun-compute",
-        "state":"up",
+            "availability_zone": "nova",
-        "created_at":"2017-02-01 03:25:07+00:00",
+            "state": "up",
-        "updated_at":"2017-02-01 06:13:07+00:00",
+            "created_at": "2017-02-01 03:25:07+00:00",
-        "report_count":166,
+            "updated_at": "2017-02-01 06:13:07+00:00",
-        "disabled":false,
+            "report_count": 166,
-        "host":"instance-1",
+            "disabled": false,
-        "forced_down":false,
+            "host": "instance-1",
-        "last_seen_up":"2017-02-01 06:13:07+00:00",
+            "forced_down": false,
-        "disabled_reason":null,
+            "last_seen_up": "2017-02-01 06:13:07+00:00",
-        "id": 1
+            "disabled_reason": null,
-      }
+            "id": 1
+        }
     ]
 }

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