This merge is in conjunction with lp:~rconradharris/nova/xs-snap-return-image-id-before-snapshot
The patch does the following:
* Image Create (POST) is broken up into 3 steps (reserve, upload and activate); reserve is used to allow the OpenStack API to return metadata about an image where the data has not been uploaded yet * Image Update (PUT) now takes image data as the request body and metadata as headers (just like POST); state is enforced so that image data can only be uploaded once. * Image statuses were changed to match the OpenStack API (queued, saving, active, killed); NOTE: preparing is not used * update_image and add_image client calls now return metadata instead of just the id