Merge "Add flag cinder_endpoint_template to volume.cinder"
Merge "fix rpcapi version."
Merge "Adds more servers list and servers details samples"
Return 400 if create volume snapshot force parameter is invalid

Fixes bug #1014689

* Add is_valid_boolstr function in utils.py
* Add force parameter check in SnapshotsController.create()
* Add unittest for invalid force parameter.

Change-Id: Ie6a07a2ac589da76f52a82b126a6d66e5987edc4
Merge "Avoid live migrate overwriting the other task_state"
Add reservations parameter when cast "create_volume" to volume manager

Fixes bug #1050192

Add reservations parameter when _cast_create_volume cast
"create_volume" to volume manager. So VolumeManager.create_volume() can
commit the reservations in volume quota.

Change-Id: I8f3104d53bde55d4d83f39253869cc78a8511750
Merge "Fix FLAGS.volumes_dir help message"
Merge "Add reservations parameter when cast "create_volume" to volume manager"
Validate keypair create request body

Check if keypair create request body has manditory keys like keypair, name
and raise HTTPBadRequest if the required keys are missing.

Fixes bug 1049619

Change-Id: Ia6129e1b04e910fbea81b62b921a228aafa32f64
Merge "Backport changes from Cinder to Nova-Volume"
Merge "Return 400 if create volume snapshot force parameter is invalid"
Merge "Validate keypair create request body"
Overload comment in generated SSH keys

Overload comment in generated SSH keys in order not to leak information
about the user and host that actually generated them. Patch based on a
suggestion by Pedro Perez.

Fixes bug 1050347.

Change-Id: I73bbdba1f6c9e83a5e7e70564959b9d7abaa5e29
Fixes import issue on Windows

Fixes Bug #1034043

The crypt module is not available on Windows.
Since this is a blocking issue on Hyper-V and since the only
function using it is _set_passwd (not implemented on Windows),
the import can be safely conditionally avoided.

Change-Id: Iefe97edcfcff3b70593e07628b6a6f85e680cbc7
Includes sec group quota details in limits API response

Added the security groups quota details to
the limit API response so that these details
also get displayed to the user.

Fixes bug 1049578
Change-Id: I45c345141747f99359c8948e959030f8cb99e866
Use tmpdir and avoid leaving test files behind

 We were just creating a file for testing iscsi persist files and
 weren't cleaning up after the test.

 Change this to use a tmpdir and make sure we leave no tracks.

 Fixes bug #1050086

Change-Id: I714177d7789da8b628ab63c163a2c3f1698dd940
Add 422 test unit test for servers API

Add a straightforward test case to check the cases where we're returning
422 from the servers API.

Add a comment to ServersAllExtensionsTestCase which clarifies who it
differs from these new 422 tests.

Change-Id: Idb39e37f4a620199abb986793ae9415a5115dba9
Add entity body validation helper

Add a _valid_body() helper for the servers API to avoid repeating the
same tests in multiple methods. Include a check that the 'server' value
is actually a dict.

Also remove the superfluous checking of req.body which is a leftover
from when the body wasn't a method parameter.

Change-Id: If8114cc76d68567005c85c803f29e30e034db89a
Remove useless _get_key_name() in servers API

This no longer does anything useful. Firstly, we already check that the
body dict has a server key. Secondly, AttributeError will never be
thrown here since we have already checked that the entity is a dict.
Finally, we don't need to set this key to None if it's not supplied
by the client since we later use get() to to look it up.

Change-Id: I4235117cc47e5b5cbdad4425edb3c7059e608d49
Merge "Add 422 test unit test for servers API"