Merge "api-ref: add missing volumes_links in list-volume interfaces"

api-ref/source/v2/parameters.yaml

@@ -874,6 +874,12 @@ links_5:
   in: body
   required: true
   type: array
+links_vol_optional:
+  description: |
+    The volume links.
+  in: body
+  required: false
+  type: array
 location:
   description: |
     Full URL to a service or server.
@@ -1903,4 +1909,4 @@ volumes_number_for_type:
     the specified volume type.
   in: body
   required: true
-  type: integer
+  type: integer

api-ref/source/v2/samples/volumes-list-detailed-response.json

@@ -94,5 +94,9 @@
             "created_at": "2015-11-29T02:25:18.000000",
             "volume_type": "lvmdriver-1"
         }
-    ]
+    ],
+    "volumes_links": [{
+        "href": "https://158.69.65.111/volume/v2/4ad9f06ab8654e40befa59a2e7cac86d/volumes/detail?limit=1&marker=3b451d5d-9358-4a7e-a746-c6fd8b0e1462",
+        "rel": "next"
+    }]
 }

api-ref/source/v2/samples/volumes-list-response.json

@@ -28,5 +28,9 @@
             ],
             "name": "vol-003"
         }
-    ]
+    ],
+    "volumes_links": [{
+        "href": "https://158.69.65.111/volume/v2/4ad9f06ab8654e40befa59a2e7cac86d/volumes/detail?limit=1&marker=3b451d5d-9358-4a7e-a746-c6fd8b0e1462",
+        "rel": "next"
+    }]
 }

api-ref/source/v2/volumes-v2-volumes.inc

@@ -119,6 +119,7 @@ Response Parameters
    - created_at: created_at
    - volumes: volumes
    - volume_type: volume_type
+   - volumes_links: links_vol_optional
 
 
 
@@ -274,6 +275,7 @@ Response Parameters
    - id: id
    - links: links
    - name: name
+   - volumes_links: links_vol_optional
 
 
 

api-ref/source/v3/parameters.yaml

@@ -1499,6 +1499,12 @@ links_vol:
   in: body
   required: true
   type: array
+links_vol_optional:
+  description: |
+    The volume links.
+  in: body
+  required: false
+  type: array
 location:
   description: |
     Full URL to a service or server.

api-ref/source/v3/samples/volumes-list-detailed-response.json

@@ -95,5 +95,9 @@
             "volume_type": "lvmdriver-1"
         }
     ],
+    "volumes_links": [{
+        "href": "https://158.69.65.111/volume/v3/4ad9f06ab8654e40befa59a2e7cac86d/volumes/detail?limit=1&marker=3b451d5d-9358-4a7e-a746-c6fd8b0e1462",
+        "rel": "next"
+    }],
     "count": 10
 }

api-ref/source/v3/samples/volumes-list-response.json

@@ -29,5 +29,9 @@
             "name": "vol-003"
         }
     ],
+    "volumes_links": [{
+        "href": "https://158.69.65.111/volume/v3/4ad9f06ab8654e40befa59a2e7cac86d/volumes/detail?limit=1&marker=3b451d5d-9358-4a7e-a746-c6fd8b0e1462",
+        "rel": "next"
+    }],
     "count": 10
 }

api-ref/source/v3/volumes-v3-volumes.inc

@@ -128,6 +128,7 @@ Response Parameters
    - created_at: created_at
    - volumes: volumes
    - volume_type: volume_type_vol
+   - volumes_links: links_vol_optional
    - count: count
 
 
@@ -294,6 +295,7 @@ Response Parameters
    - id: id_vol
    - links: links_vol
    - name: name_vol
+   - volumes_links: links_vol_optional
    - count: count