Updated openstack/openstack
Project: openstack/nova  41b89f2a6b9bd6dc546f950ea4cd25386cfcfa84
null
Make sure "volumeId" in req body on volume actions

We should check whether the parameter "volumeId" is in request body while
attaching a volume to an instance and while swapping volume.

Change-Id: I0be2ae4c80615c0304cd1a0d8ca0a4282a0867c7
Closes-Bug: #1257135
Updated openstack/openstack
Project: openstack/tempest  e53afc73a0bff63e4817ad0a273d5e1a203b370e
null
Stop volume leaking even if an error is occurred

In some test, if an error is occurred in setUpClass(), some resources
are not deleted because of tearDownClass() is not called.
This commit fixes it.

Partially Implements: blueprint stop-leaking

Change-Id: I6839645285da4ecd59e536b6413a67f0acaf7d6c