Merge "[api-ref] Refactor Manila availability-zones API"

api-ref/source/availability-zones.inc

@@ -36,10 +36,10 @@ Response parameters
 .. rest_parameters:: parameters.yaml
 
    - availability_zones: availability_zones
-   - id: id_9
-   - name: name_6
-   - created_at: created_at_7
-   - updated_at: updated_at_4
+   - id: availability_zone_id
+   - name: availability_zone_name
+   - created_at: availability_zone_created_at
+   - updated_at: availability_zone_updated_at
 
 Response example
 ----------------

api-ref/source/parameters.yaml

@@ -571,6 +571,54 @@ availability_zone_1:
   in: body
   required: true
   type: string
+availability_zone_created_at:
+  description: |
+    The date and time stamp when the availability zone was created.
+
+    The date and time stamp format is `ISO 8601
+    <https://en.wikipedia.org/wiki/ISO_8601>`_:
+
+    ::
+
+       CCYY-MM-DDThh:mm:ss±hh:mm
+
+    The ``±hh:mm`` value, if included, returns the time zone as an
+    offset from UTC.
+
+    For example, ``2015-08-27T09:49:58-05:00``.
+  in: body
+  required: true
+  type: string
+availability_zone_id:
+  description: |
+    The availability zone ID.
+  in: body
+  required: true
+  type: string
+availability_zone_name:
+  description: |
+    The name of the availability zone.
+  in: body
+  required: true
+  type: string
+availability_zone_updated_at:
+  description: |
+    The date and time stamp when the availability zone was updated.
+
+    The date and time stamp format is `ISO 8601
+    <https://en.wikipedia.org/wiki/ISO_8601>`_:
+
+    ::
+
+       CCYY-MM-DDThh:mm:ss±hh:mm
+
+    The ``±hh:mm`` value, if included, returns the time zone as an
+    offset from UTC.
+
+    For example, ``2015-08-27T09:49:58-05:00``.
+  in: body
+  required: true
+  type: string
 availability_zones:
   description: |
     Top level response body element.
@@ -1064,24 +1112,6 @@ created_at_6:
   in: body
   required: true
   type: string
-created_at_7:
-  description: |
-    The date and time stamp when the availability zone was created.
-
-    The date and time stamp format is `ISO 8601
-    <https://en.wikipedia.org/wiki/ISO_8601>`_:
-
-    ::
-
-       CCYY-MM-DDThh:mm:ss±hh:mm
-
-    The ``±hh:mm`` value, if included, returns the time zone as an
-    offset from UTC.
-
-    For example, ``2015-08-27T09:49:58-05:00``.
-  in: body
-  required: true
-  type: string
 created_at_8:
   description: |
     The date and time stamp when the member was
@@ -1615,12 +1645,6 @@ id_8:
   in: body
   required: true
   type: string
-id_9:
-  description: |
-    The availability zone ID.
-  in: body
-  required: true
-  type: string
 ip_version:
   description: |
     The IP version of the network. A valid value is
@@ -1827,12 +1851,6 @@ name_5:
   in: body
   required: false
   type: string
-name_6:
-  description: |
-    The name of the availability zone.
-  in: body
-  required: true
-  type: string
 name_8:
   description: |
     The consistency group snapshot name.
@@ -3260,24 +3278,6 @@ updated_at_3:
   in: body
   required: true
   type: string
-updated_at_4:
-  description: |
-    The date and time stamp when the availability zone was updated.
-
-    The date and time stamp format is `ISO 8601
-    <https://en.wikipedia.org/wiki/ISO_8601>`_:
-
-    ::
-
-       CCYY-MM-DDThh:mm:ss±hh:mm
-
-    The ``±hh:mm`` value, if included, returns the time zone as an
-    offset from UTC.
-
-    For example, ``2015-08-27T09:49:58-05:00``.
-  in: body
-  required: true
-  type: string
 updated_at_5:
   description: |
     The date and time stamp when the service was updated.