Merge "Fix wrong parameters at the "Update volume""

api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.json

@@ -1,6 +1,8 @@
 {
     "volume": {
         "status": "available",
+        "migration_status": null,
+        "user_id": "0eea4eabcf184061a3b6db1e0daaf010",
         "attachments": [],
         "links": [
             {
@@ -13,16 +15,22 @@
             }
         ],
         "availability_zone": "nova",
+        "bootable": "false",
+        "encrypted": false,
+        "created_at": "2015-11-29T03:01:44.000000",
+        "description": "This is yet, another volume.",
+        "updated_at": null,
+        "volume_type": "lvmdriver-1",
+        "name": "vol-003",
+        "replication_status": "disabled",
+        "consistencygroup_id": null,
         "source_volid": null,
         "snapshot_id": null,
-        "id": "5aa119a8-d25b-45a7-8d1b-88e127885635",
-        "description": "This is yet, another volume.",
-        "name": "vol-003",
-        "created_at": "2013-02-25T02:40:21.000000",
-        "volume_type": "None",
-        "size": 1,
+        "multiattach": false,
         "metadata": {
             "contents": "not junk"
-        }
+        },
+        "id": "5aa119a8-d25b-45a7-8d1b-88e127885635",
+        "size": 1
     }
 }

api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl

@@ -432,6 +432,7 @@
                         href="../samples/volumes/volume-update-request.json"
                     />
                 </wadl:doc>
+                &createVolumeRequestParameters;
             </representation>
         </request>
         <response status="200">