Merge lp:~gandelman-a/ubuntu/precise/python-cinderclient/trunk into lp:~ubuntu-cloud-archive/ubuntu/precise/python-cinderclient/trunk

[Adam Gandelman]

Unmerged revisions

7. By Adam Gandelman on 2013-01-10

* New upstream release for the Ubuntu Cloud Archive.
* New upstream release.
* New upstream release.
* debian/control: Add python-requests as a build dep
* debian/control: Add python-testtools and python-fixtures as a build dep.
* debian/control: add python-setuptools-git dependency
* debian/copyright: Removed remaining dh boilerplate template.

=== removed file '.gitignore'
--- .gitignore	2012-08-16 12:03:50 +0000
+++ .gitignore	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-.coverage
-.venv
-*,cover
-cover
-*.pyc
-.idea
-*.swp
-*~
-AUTHORS
-build
-dist
-.*egg-info
-cinderclient/versioninfo

=== removed file '.gitreview'
--- .gitreview	2012-08-16 12:03:50 +0000
+++ .gitreview	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/python-cinderclient.git

=== modified file 'AUTHORS'
--- AUTHORS	2012-10-01 12:05:26 +0000
+++ AUTHORS	2013-01-10 22:15:27 +0000
@@ -1,16 +1,23 @@
 Adam Gandelman <[e-mail]>
+Alessandro Pilotti <[e-mail]>
 Anthony Young <[e-mail]>
 Avishay Traeger <[e-mail]>
 Bhuvan Arumugam <[e-mail]>
 Chmouel Boudjnah <[e-mail]>
+Christian Berendt <[e-mail]>
 Chuck Short <[e-mail]>
 Clark Boylan <[e-mail]>
 Clay Gerrard <[e-mail]>
+Cory Stone <[e-mail]>
 Dean Troyer <[e-mail]>
+Doug Hellmann <[e-mail]>
+Eric Harney <[e-mail]>
 jakedahn <[e-mail]>
+john-griffith <[e-mail]>
 John Griffith <[e-mail]>
 Josh Durgin <[e-mail]>
 lrqrun <[e-mail]>
+Mike Perez <[e-mail]>
 Monty Taylor <[e-mail]>
 Rongze Zhu <[e-mail]>
 Vincent Hou <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-01 12:05:26 +0000
+++ ChangeLog	2013-01-10 22:15:27 +0000
@@ -1,3 +1,468 @@
+commit 61e2a4237f0d7a4c5c9591ac364a01c844309757
+Merge: 06acb0c 765cb3d
+Author: Jenkins <[e-mail]>
+Date:   Wed Jan 9 07:57:09 2013 +0000
+
+    Merge "Add access to update volume metadata."
+
+commit 765cb3ddbea2f0e770a2ad911b1ba17760b50818
+Author: John Griffith <[e-mail]>
+Date:   Sat Jan 5 01:12:59 2013 +0000
+
+    Add access to update volume metadata.
+    
+    This implements the cinderclient side of
+    blueprint: update-vol-metadata
+    
+    Change-Id: I97c120d69b6d30843009f6a297bb51299799f4ec
+
+ cinderclient/v1/shell.py   |   25 +++++++++++++++++++++++++
+ cinderclient/v1/volumes.py |   30 ++++++++++++++++++++++++++++++
+ tests/v1/fakes.py          |   15 +++++++++++++++
+ tests/v1/test_shell.py     |   15 +++++++++++++++
+ tests/v1/test_volumes.py   |   13 +++++++++++--
+ 5 files changed, 96 insertions(+), 2 deletions(-)
+
+commit 06acb0c009ac53777884cf5b0aa8942184d06622
+Author: Monty Taylor <[e-mail]>
+Date:   Mon Dec 24 21:49:34 2012 -0600
+
+    Move from unittest2 to testtools
+    
+    Part of blueprint grizzly-testtools
+    
+    Change-Id: I13e068ca156f12114eaa3a65bdb557e4eb2c988d
+
+ tests/test_client.py   |    3 ---
+ tests/test_shell.py    |   43 ++++++++++++++++++++++++-------------------
+ tests/test_utils.py    |    1 +
+ tests/utils.py         |    4 ++--
+ tests/v1/test_shell.py |   24 +++++++++++++++---------
+ tools/test-requires    |    7 ++++---
+ 6 files changed, 46 insertions(+), 36 deletions(-)
+
+commit bf7b86748a49455ae1545f01fe5cfc9b801223aa
+Merge: 9a49690 2473311
+Author: Jenkins <[e-mail]>
+Date:   Fri Dec 21 08:46:11 2012 +0000
+
+    Merge "Add clone volume support to cinderclient."
+
+commit 9a496900964c7037db994db800bab456d57c2164
+Author: john-griffith <[e-mail]>
+Date:   Mon Dec 17 14:52:05 2012 -0700
+
+    Add list-extensions capability to cinderclient.
+    
+    Implements the list extension functionality from novaclient
+    written by harlowja (Change-Id: I5b72f5ea73c00f1c1a0f09f670d744c820e05837)
+    
+    This provides a mechanism to view available extensions, and also
+    starts actually using the cinderclient contrib dir.
+    
+    Original Author: harlowja
+    
+    Change-Id: I4f9d04cb8a2aa05c978a2a5a926c9175ee3614bb
+
+ cinderclient/v1/contrib/list_extensions.py |   47 ++++++++++++++++++++++++++++
+ tests/v1/contrib/test_list_extensions.py   |   21 +++++++++++++
+ tests/v1/fakes.py                          |   30 ++++++++++++++++--
+ 3 files changed, 96 insertions(+), 2 deletions(-)
+
+commit 82e47d0866397b702ae777972add66b33afae69e
+Author: Dean Troyer <[e-mail]>
+Date:   Thu Dec 13 12:01:07 2012 -0600
+
+    Use requests module for HTTP/HTTPS
+    
+    * Implement correct certificate verification
+    * Add --os-cacert
+    * Rework tests for requests
+    
+    Pinned requests module to < 1.0 as 1.0.2 is now current in pipi
+    as of 17Dec2012.
+    
+    Blueprint: tls-verify
+    
+    Change-Id: I71066ff7297f3b70c08b7ae1c8ae8b6a1b82bbae
+
+ cinderclient/client.py     |   95 +++++++++++++++++------------
+ cinderclient/exceptions.py |   19 +++---
+ cinderclient/shell.py      |   17 ++++--
+ cinderclient/v1/client.py  |    6 +-
+ tests/test_http.py         |   87 +++++++++++++++------------
+ tests/test_shell.py        |    6 --
+ tests/utils.py             |   30 +++++++++-
+ tests/v1/fakes.py          |  109 ++++++++++++++++++----------------
+ tests/v1/test_auth.py      |  142 +++++++++++++++++++++++---------------------
+ tools/pip-requires         |    2 +-
+ 10 files changed, 296 insertions(+), 217 deletions(-)
+
+commit d3603535d2f47580bf49520048af1f27adea3e7c
+Author: Dean Troyer <[e-mail]>
+Date:   Thu Dec 13 14:52:54 2012 -0600
+
+    Port some additional logging changes from novaclient
+    
+    * Allows capture of timestamps prior to and after request for timing
+      https://review.openstack.org/11519
+    * Add -X to DELETE and PUT in debug mode
+      https://review.openstack.org/12069
+    * Show request body in curl command
+      https://review.openstack.org/12203
+    
+    Change-Id: I0d87ab6b3c2b35ff843323cb818915e03993a844
+
+ cinderclient/client.py |   18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+commit e30724df5b55f5b989f294f82ad7209e150b3559
+Author: Dean Troyer <[e-mail]>
+Date:   Thu Dec 13 15:25:01 2012 -0600
+
+    Bring back the output from client.http_log()
+    
+    Ported from novaclient https://review.openstack.org/9241
+    Support CINDERCLIENT_DEBUG as synonym for --debug
+    
+    Change-Id: Ic03b9e7d84c8db14f6e193ca2b478fd0d70d1299
+
+ cinderclient/client.py    |   34 ++++++++++++++++++----------------
+ cinderclient/shell.py     |    6 ++++--
+ cinderclient/v1/client.py |    6 ++++--
+ 3 files changed, 26 insertions(+), 20 deletions(-)
+
+commit 24733119fe5da11bccf16d345f6f27cec8bbd06f
+Author: John Griffith <[e-mail]>
+Date:   Thu Dec 13 21:21:55 2012 +0000
+
+    Add clone volume support to cinderclient.
+    
+    Adds the option to create a clone of a volume, using --source-volid xxx
+    
+    relies on Change-Id: I72bf90baf22bec2d4806d00e2b827a594ed213f4
+    
+    Change-Id: Iad2178deb66c328625fbff747e123044f9d86a88
+
+ cinderclient/v1/shell.py   |    9 +++++++++
+ cinderclient/v1/volumes.py |    4 +++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+commit 9201cee6ef79dd4955f6f762e6adfaee65885ca1
+Author: Monty Taylor <[e-mail]>
+Date:   Fri Nov 30 14:22:54 2012 -0800
+
+    Update to swapped versioninfo logic.
+    
+    Change-Id: I6a8dd1c84df0a92c21f468c7dcad1ce79f69c463
+
+ cinderclient/openstack/common/setup.py |   18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+commit 5adf79136042004ceb76d3d1e68e0ab08edf1917
+Author: Monty Taylor <[e-mail]>
+Date:   Fri Nov 30 14:05:54 2012 -0800
+
+    Align cinderclient version code.
+    
+    Change-Id: I81d6a279a52656720626357a1c4ca8bb382ef1f8
+
+ .gitignore                               |    2 +
+ MANIFEST.in                              |    9 +-
+ cinderclient/__init__.py                 |   36 ++++++++
+ cinderclient/openstack/common/version.py |  148 ++++++++++++++++++++++++++++++
+ openstack-common.conf                    |    2 +-
+ setup.py                                 |    4 +-
+ 6 files changed, 192 insertions(+), 9 deletions(-)
+
+commit a74dee000e682b5b227cd9032df6719aa22ffb00
+Merge: 3ca2c99 62eb92a
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 22 07:55:01 2012 +0000
+
+    Merge "Pin pep8 to 1.3.3"
+
+commit 3ca2c999583a57ef785ee011ac8d805571b8624c
+Merge: 79dc21d c01e782
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 22 06:13:15 2012 +0000
+
+    Merge "Adding bootable column to volume list view"
+
+commit c01e7822f9de3b17b8cca8d0b10cbf03e6890f8f
+Author: Mike Perez <[e-mail]>
+Date:   Sun Nov 18 19:55:49 2012 -0800
+
+    Adding bootable column to volume list view
+    
+    displays whether a volume is bootable based on cinder's api response for
+    /volumes
+    
+    Change-Id: I8f6cc6e02be8226914f65717dcb2e0367553e51f
+
+ cinderclient/v1/shell.py |    2 +-
+ tests/v1/fakes.py        |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+commit 62eb92a1f2cffa5a81778018932b539f436b50f0
+Author: Chuck Short <[e-mail]>
+Date:   Tue Nov 20 09:41:28 2012 -0600
+
+    Pin pep8 to 1.3.3
+    
+    Apart of making pep8 version standard across all openstack
+    projects.
+    
+    Change-Id: If5ef6be394e557b3554a80f1ad9b44d472c273b6
+    Signed-off-by: Chuck Short <[e-mail]>
+
+ tools/test-requires |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 79dc21d17183fa78126515f9d8436c207fbed7b7
+Author: Christian Berendt <[e-mail]>
+Date:   Thu Nov 8 23:33:14 2012 +0100
+
+    show help when calling without arguments
+    
+    When calling cinder without arguments you'll receive the following
+    output:
+    
+    error: too few arguments
+    Try 'cinder help ' for more information.
+    
+    With this change the help is also shown when calling cinder
+    without arguments. I think that's the expected behavior.
+    
+    Change-Id: I8f46f67b7fef472ac344bb74f80cf1b77c4c4745
+
+ cinderclient/shell.py |    2 +-
+ tests/test_shell.py   |   18 ++++++------------
+ 2 files changed, 7 insertions(+), 13 deletions(-)
+
+commit 112bd60d4e17ad435c274d52585f70faaaf9f70d
+Author: Cory Stone <[e-mail]>
+Date:   Thu Nov 1 14:27:52 2012 -0500
+
+    Add retries to cinderclient.
+    
+    HTTPClient now supports a retries argument. It will reissue requests
+    for any 5xx or socket (400 with n/a) errors. This retry loop was
+    "inspired" by swiftclient's loop. It reauths one extra time if
+    necessary.  It uses backoff times of 1, 2, 4... seconds.
+    
+    The default is 0 retries. It is also exposed to the shell as well with
+    a --retries arg.
+    
+    Change-Id: I67bed02d65155f4a4d5d879bb233f56cc78849fa
+
+ cinderclient/client.py    |   54 ++++++++++++++++------
+ cinderclient/shell.py     |    9 +++-
+ cinderclient/v1/client.py |    5 +-
+ tests/test_http.py        |  113 +++++++++++++++++++++++++++++++++++++++++++--
+ 4 files changed, 159 insertions(+), 22 deletions(-)
+
+commit 1abc0b4edfa70485cd32bac2060b1b223850752e
+Author: Alessandro Pilotti <[e-mail]>
+Date:   Tue Nov 6 19:38:28 2012 +0200
+
+    Fixes setup compatibility issue on Windows
+    
+    Fixes Bug #1052161
+    
+    "python setup.py build" fails on Windows due to a hardcoded shell path:
+    /bin/sh
+    
+    setup.py updated using openstack-common/update.py
+    
+    Change-Id: Iafae444a43c76560020a84e3a1c5c8cb4b6860da
+
+ cinderclient/openstack/common/setup.py |  120 +++++++++++++++++++++-----------
+ openstack-common.conf                  |    7 ++
+ 2 files changed, 85 insertions(+), 42 deletions(-)
+
+commit dcbebd7b78235008e36fe6b8c8cc4a75f5031042
+Author: John Griffith <[e-mail]>
+Date:   Fri Nov 2 22:17:03 2012 +0000
+
+    Revert "Add retries to cinderclient."
+    
+    This reverts commit 3b1eda3b3bb6678e9c9ec3e783e3e12b0c42f0a4
+
+ cinderclient/client.py    |   47 +++++++++++-----------------------
+ cinderclient/shell.py     |    8 +-----
+ cinderclient/v1/client.py |    5 ++--
+ tests/test_http.py        |   62 +--------------------------------------------
+ 4 files changed, 19 insertions(+), 103 deletions(-)
+
+commit 3b1eda3b3bb6678e9c9ec3e783e3e12b0c42f0a4
+Author: Cory Stone <[e-mail]>
+Date:   Thu Nov 1 14:27:52 2012 -0500
+
+    Add retries to cinderclient.
+    
+    HTTPClient now supports a retries argument. It will reissue requests
+    for any 5xx or socket (400 with n/a) errors. This retry loop was
+    "inspired" by swiftclient's loop. It reauths one time if necessary.
+    It uses backoff times of 1, 2, 4... seconds.
+    
+    The default is 0 retries. It is also exposed to the shell as well with
+    a --retries arg.
+    
+    Change-Id: I75d9a13d6c4ba16a5da13d4bf5cad78a777d67d7
+
+ cinderclient/client.py    |   47 +++++++++++++++++++++++-----------
+ cinderclient/shell.py     |    8 +++++-
+ cinderclient/v1/client.py |    5 ++--
+ tests/test_http.py        |   62 ++++++++++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 103 insertions(+), 19 deletions(-)
+
+commit 7d3749e7c3c3f66900a4b08563a3b1e8d1dd0c35
+Merge: 0288e7f a8be1b2
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 1 19:04:42 2012 +0000
+
+    Merge "Remove extra-specs from types-list command output"
+
+commit 0288e7fd095037898fe451275a3ecfc183eac134
+Merge: 92bd08b 28d4d6b
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 1 18:59:45 2012 +0000
+
+    Merge "Remove attach/detach code from cinderclient"
+
+commit a8be1b2a205dfba0a23d92454be67adfe0a0aaf4
+Author: John Griffith <[e-mail]>
+Date:   Wed Oct 31 18:10:54 2012 -0600
+
+    Remove extra-specs from types-list command output
+    
+    type-list was including the extra-specs info in it's response,
+    however extra-specs are admin accessible only. As a result only admin
+    users could run type-list which is not what we want.
+    
+    Add a seperate admin only call to provide volume-types with associated
+    extra-specs info (extra-specs-list).
+    
+    Change-Id: I2a716cd7076fb17fd5f2ceb94363eef0009e9bce
+
+ cinderclient/v1/shell.py |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+commit 92bd08b9e1082620d41e827db2eeade5da6c8e19
+Merge: 4649420 942ab5c
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 20:24:16 2012 +0000
+
+    Merge "Add volume_type extra_specs support to client"
+
+commit 28d4d6bfd09063e8d814cf64ef504aa01a9a90e7
+Author: John Griffith <[e-mail]>
+Date:   Tue Oct 30 10:24:47 2012 -0600
+
+    Remove attach/detach code from cinderclient
+    
+    Attach and Detach actions are done in the novaclient, however
+    during the creation of Cinder a number of these methods were copied into
+    the Cinder client.  This is dead code and just adds confusion, so let's
+    rip it out.
+    
+    Change-Id: Ib96fe0cac26f19e7d9f2aa01c71ba9762e4f8b8e
+    Fixes: bug #1071003
+
+ cinderclient/v1/volumes.py |   46 --------------------------------------------
+ 1 file changed, 46 deletions(-)
+
+commit 4649420ca2e8e24c8e651d141839d62fbbb53416
+Merge: c20d7d9 01dad32
+Author: Jenkins <[e-mail]>
+Date:   Tue Oct 30 16:15:09 2012 +0000
+
+    Merge "Fix support for Unicode volume names"
+
+commit c20d7d902ee6e2ef50f20fa850f47afa310b5998
+Author: Dean Troyer <[e-mail]>
+Date:   Tue Oct 23 14:48:38 2012 -0500
+
+    Add python_cinderclient.egg-info to .gitignore
+    
+    Change-Id: I24a7a5f423e99a9b6839b5f3a1b1fbf05297dc53
+
+ .gitignore |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 01dad32c07ad500f2e0000dcd24a50f5c47cd206
+Author: Eric Harney <[e-mail]>
+Date:   Tue Oct 23 15:40:17 2012 -0400
+
+    Fix support for Unicode volume names
+    
+    It is possible to create a Unicode volume from the command line,
+    but it cannot be manipulated by name for operations such as delete.
+    This is because the find_resource function tries to match the
+    Unicode string to a regular byte string, and a UnicodeWarning is
+    issued, failing the match.  Fix by decoding the Unicode name when
+    trying to match.
+    
+    Fixes bug 1065275.
+    
+    Change-Id: I8e19a78bbc1ccb503ccd39dc3b904fc4f6f77858
+
+ cinderclient/utils.py |   20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+commit 5a3a18d0cbe71ae7e150fe69efe5239601413f9b
+Author: Doug Hellmann <[e-mail]>
+Date:   Mon Oct 22 18:42:34 2012 -0400
+
+    Add OpenStack trove classifier for PyPI
+    
+    Add trove classifier to have the client listed among the
+    other OpenStack-related projets on PyPI.
+    
+    Change-Id: I904372caf0a8eaa44dd048729b4d87e5333f04cc
+    Signed-off-by: Doug Hellmann <[e-mail]>
+
+ setup.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 942ab5c7fe901dd925ee38328c91e1cd160bc437
+Author: John Griffith <[e-mail]>
+Date:   Tue Oct 9 18:45:41 2012 -0600
+
+    Add volume_type extra_specs support to client
+    
+    Adds ability to set/clear volume_type extra_specs
+    via python-cinderclient.
+    
+    * Adds extra_specs info to the list-types output
+    * Adds missing tests for volume_types features
+    * Fixes unset loop so it actually iterates through all of the supplied keys
+    
+    Change-Id: I3552de722f76389cfef6d4f12320720e022ebfac
+
+ cinderclient/v1/client.py       |    4 +--
+ cinderclient/v1/shell.py        |   63 ++++++++++++++++++++++++++++++++-------
+ cinderclient/v1/volume_types.py |   47 ++++++++++++++++++++++++++++-
+ tests/v1/fakes.py               |   32 ++++++++++++++++++++
+ tests/v1/test_types.py          |   35 ++++++++++++++++++++++
+ 5 files changed, 167 insertions(+), 14 deletions(-)
+
+commit 7cba8eb7863705fcf0ef5c677cef2d334bd8ad26
+Author: Clay Gerrard <[e-mail]>
+Date:   Tue Aug 28 20:20:35 2012 +0000
+
+    add rename and snapshot-rename commands
+    
+    Change-Id: I06549f19b846d886fabd611d2167b894c4d02df8
+
+ cinderclient/v1/shell.py            |   34 +++++++++++++++++++++++++++
+ cinderclient/v1/volume_snapshots.py |   19 +++++++++++++++
+ cinderclient/v1/volumes.py          |   19 +++++++++++++++
+ tests/v1/fakes.py                   |   36 +++++++++++++++++++++++++++-
+ tests/v1/test_shell.py              |   44 +++++++++++++++++++++++++++++++++++
+ 5 files changed, 151 insertions(+), 1 deletion(-)
+
 commit 2e6be694c17d505bf52e339bccf6848776493ffe
 Author: Vishvananda Ishaya <[e-mail]>
 Date:   Thu Sep 20 14:29:21 2012 +0000

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-08-16 12:03:50 +0000
+++ MANIFEST.in	2013-01-10 22:15:27 +0000
@@ -1,10 +1,5 @@
 include AUTHORS
 include ChangeLog
-include HACKING
-include LICENSE
-include README.rst
-include run_tests.sh tox.ini
 include cinderclient/versioninfo
-recursive-include doc *
-recursive-include tests *
-recursive-include tools *
+exclude .gitignore
+exclude .gitreview

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-10-01 12:05:26 +0000
+++ PKG-INFO	2013-01-10 22:15:27 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-cinderclient
-Version: 1.0.0
+Version: 1.0.2.3.g61e2a42
 Summary: Client library for OpenStack Cinder API.
 Home-page: https://github.com/openstack/python-cinderclient
 Author: Rackspace, based on work by Jacob Kaplan-Moss
@@ -161,6 +161,7 @@
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
+Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: Apache Software License

=== modified file 'cinderclient/__init__.py'
--- cinderclient/__init__.py	2012-06-27 13:32:14 +0000
+++ cinderclient/__init__.py	2013-01-10 22:15:27 +0000
@@ -0,0 +1,36 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2012 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import inspect
+
+
+def _get_client_version():
+    """Read version from versioninfo file."""
+    mod_abspath = inspect.getabsfile(inspect.currentframe())
+    client_path = os.path.dirname(mod_abspath)
+    version_path = os.path.join(client_path, 'versioninfo')
+
+    if os.path.exists(version_path):
+        version = open(version_path).read().strip()
+    else:
+        version = "Unknown, couldn't find versioninfo file at %s"\
+                  % version_path
+
+    return version
+
+
+__version__ = _get_client_version()

=== modified file 'cinderclient/client.py'
--- cinderclient/client.py	2012-10-01 12:05:26 +0000
+++ cinderclient/client.py	2013-01-10 22:15:27 +0000
@@ -7,10 +7,14 @@
 OpenStack Client interface. Handles the REST calls and responses.
 """
 
-import httplib2
 import logging
 import os
+import sys
 import urlparse
+try:
+    from eventlet import sleep
+except ImportError:
+    from time import sleep
 
 try:
     import json
@@ -22,28 +26,27 @@
     import cgi
     urlparse.parse_qsl = cgi.parse_qsl
 
+import requests
+
 from cinderclient import exceptions
 from cinderclient import service_catalog
 from cinderclient import utils
 
 
-_logger = logging.getLogger(__name__)
-if 'CINDERCLIENT_DEBUG' in os.environ and os.environ['CINDERCLIENT_DEBUG']:
-    ch = logging.StreamHandler()
-    _logger.setLevel(logging.DEBUG)
-    _logger.addHandler(ch)
-
-
-class HTTPClient(httplib2.Http):
+class HTTPClient(object):
 
     USER_AGENT = 'python-cinderclient'
 
+    requests_config = {
+        'danger_mode': False,
+    }
+
     def __init__(self, user, password, projectid, auth_url, insecure=False,
                  timeout=None, tenant_id=None, proxy_tenant_id=None,
                  proxy_token=None, region_name=None,
                  endpoint_type='publicURL', service_type=None,
-                 service_name=None, volume_service_name=None):
-        super(HTTPClient, self).__init__(timeout=timeout)
+                 service_name=None, volume_service_name=None, retries=None,
+                 http_log_debug=False, cacert=None):
         self.user = user
         self.password = password
         self.projectid = projectid
@@ -55,23 +58,36 @@
         self.service_type = service_type
         self.service_name = service_name
         self.volume_service_name = volume_service_name
+        self.retries = int(retries or 0)
+        self.http_log_debug = http_log_debug
 
         self.management_url = None
         self.auth_token = None
         self.proxy_token = proxy_token
         self.proxy_tenant_id = proxy_tenant_id
 
-        # httplib2 overrides
-        self.force_exception_to_status_code = True
-        self.disable_ssl_certificate_validation = insecure
-
-    def http_log(self, args, kwargs, resp, body):
-        if not _logger.isEnabledFor(logging.DEBUG):
+        if insecure:
+            self.verify_cert = False
+        else:
+            if cacert:
+                self.verify_cert = cacert
+            else:
+                self.verify_cert = True
+
+        self._logger = logging.getLogger(__name__)
+        if self.http_log_debug:
+            ch = logging.StreamHandler()
+            self._logger.setLevel(logging.DEBUG)
+            self._logger.addHandler(ch)
+            self.requests_config['verbose'] = sys.stderr
+
+    def http_log_req(self, args, kwargs):
+        if not self.http_log_debug:
             return
 
         string_parts = ['curl -i']
         for element in args:
-            if element in ('GET', 'POST'):
+            if element in ('GET', 'POST', 'DELETE', 'PUT'):
                 string_parts.append(' -X %s' % element)
             else:
                 string_parts.append(' %s' % element)
@@ -80,59 +96,94 @@
             header = ' -H "%s: %s"' % (element, kwargs['headers'][element])
             string_parts.append(header)
 
-        _logger.debug("REQ: %s\n" % "".join(string_parts))
         if 'body' in kwargs:
-            _logger.debug("REQ BODY: %s\n" % (kwargs['body']))
-        _logger.debug("RESP:%s %s\n", resp, body)
-
-    def request(self, *args, **kwargs):
+            string_parts.append(" -d '%s'" % (kwargs['body']))
+        self._logger.debug("\nREQ: %s\n" % "".join(string_parts))
+
+    def http_log_resp(self, resp):
+        if not self.http_log_debug:
+            return
+        self._logger.debug(
+            "RESP: [%s] %s\nRESP BODY: %s\n",
+            resp.status_code,
+            resp.headers,
+            resp.text)
+
+    def request(self, url, method, **kwargs):
         kwargs.setdefault('headers', kwargs.get('headers', {}))
         kwargs['headers']['User-Agent'] = self.USER_AGENT
         kwargs['headers']['Accept'] = 'application/json'
         if 'body' in kwargs:
             kwargs['headers']['Content-Type'] = 'application/json'
-            kwargs['body'] = json.dumps(kwargs['body'])
-
-        resp, body = super(HTTPClient, self).request(*args, **kwargs)
-
-        self.http_log(args, kwargs, resp, body)
-
-        if body:
+            kwargs['data'] = json.dumps(kwargs['body'])
+            del kwargs['body']
+
+        self.http_log_req((url, method,), kwargs)
+        resp = requests.request(
+            method,
+            url,
+            verify=self.verify_cert,
+            config=self.requests_config,
+            **kwargs)
+        self.http_log_resp(resp)
+
+        if resp.text:
             try:
-                body = json.loads(body)
+                body = json.loads(resp.text)
             except ValueError:
                 pass
+                body = None
         else:
             body = None
 
-        if resp.status >= 400:
+        if resp.status_code >= 400:
             raise exceptions.from_response(resp, body)
 
         return resp, body
 
     def _cs_request(self, url, method, **kwargs):
-        if not self.management_url:
-            self.authenticate()
-
-        # Perform the request once. If we get a 401 back then it
-        # might be because the auth token expired, so try to
-        # re-authenticate and try again. If it still fails, bail.
-        try:
+        auth_attempts = 0
+        attempts = 0
+        backoff = 1
+        while True:
+            attempts += 1
+            if not self.management_url or not self.auth_token:
+                self.authenticate()
             kwargs.setdefault('headers', {})['X-Auth-Token'] = self.auth_token
             if self.projectid:
                 kwargs['headers']['X-Auth-Project-Id'] = self.projectid
-
-            resp, body = self.request(self.management_url + url, method,
-                                      **kwargs)
-            return resp, body
-        except exceptions.Unauthorized, ex:
             try:
-                self.authenticate()
                 resp, body = self.request(self.management_url + url, method,
                                           **kwargs)
                 return resp, body
+            except exceptions.BadRequest as e:
+                if attempts > self.retries:
+                    raise
             except exceptions.Unauthorized:
-                raise ex
+                if auth_attempts > 0:
+                    raise
+                self._logger.debug("Unauthorized, reauthenticating.")
+                self.management_url = self.auth_token = None
+                # First reauth. Discount this attempt.
+                attempts -= 1
+                auth_attempts += 1
+                continue
+            except exceptions.ClientException as e:
+                if attempts > self.retries:
+                    raise
+                if 500 <= e.code <= 599:
+                    pass
+                else:
+                    raise
+            except requests.exceptions.ConnectionError as e:
+                # Catch a connection refused from requests.request
+                self._logger.debug("Connection refused: %s" % e)
+                raise
+            self._logger.debug(
+                "Failed attempt(%s of %s), retrying in %s seconds" %
+                (attempts, self.retries, backoff))
+            sleep(backoff)
+            backoff *= 2
 
     def get(self, url, **kwargs):
         return self._cs_request(url, 'GET', **kwargs)
@@ -151,7 +202,7 @@
         We may get redirected to another site, fail or actually get
         back a service catalog with a token and our endpoints."""
 
-        if resp.status == 200:  # content must always present
+        if resp.status_code == 200:  # content must always present
             try:
                 self.auth_url = url
                 self.service_catalog = \
@@ -179,7 +230,7 @@
                 print "Could not find any suitable endpoint. Correct region?"
                 raise
 
-        elif resp.status == 305:
+        elif resp.status_code == 305:
             return resp['location']
         else:
             raise exceptions.from_response(resp, body)
@@ -199,7 +250,7 @@
         # GET ...:5001/v2.0/tokens/#####/endpoints
         url = '/'.join([url, 'tokens', '%s?belongsTo=%s'
                         % (self.proxy_token, self.proxy_tenant_id)])
-        _logger.debug("Using Endpoint URL: %s" % url)
+        self._logger.debug("Using Endpoint URL: %s" % url)
         resp, body = self.request(url, "GET",
                                   headers={'X-Auth_Token': self.auth_token})
         return self._extract_service_catalog(url, resp, body,
@@ -262,16 +313,16 @@
             headers['X-Auth-Project-Id'] = self.projectid
 
         resp, body = self.request(url, 'GET', headers=headers)
-        if resp.status in (200, 204):  # in some cases we get No Content
+        if resp.status_code in (200, 204):  # in some cases we get No Content
             try:
                 mgmt_header = 'x-server-management-url'
-                self.management_url = resp[mgmt_header].rstrip('/')
-                self.auth_token = resp['x-auth-token']
+                self.management_url = resp.headers[mgmt_header].rstrip('/')
+                self.auth_token = resp.headers['x-auth-token']
                 self.auth_url = url
-            except KeyError:
+            except (KeyError, TypeError):
                 raise exceptions.AuthorizationFailure()
-        elif resp.status == 305:
-            return resp['location']
+        elif resp.status_code == 305:
+            return resp.headers['location']
         else:
             raise exceptions.from_response(resp, body)
 
@@ -303,13 +354,11 @@
         token_url = url + "/tokens"
 
         # Make sure we follow redirects when trying to reach Keystone
-        tmp_follow_all_redirects = self.follow_all_redirects
-        self.follow_all_redirects = True
-
-        try:
-            resp, body = self.request(token_url, "POST", body=body)
-        finally:
-            self.follow_all_redirects = tmp_follow_all_redirects
+        resp, body = self.request(
+            token_url,
+            "POST",
+            body=body,
+            allow_redirects=True)
 
         return self._extract_service_catalog(url, resp, body)
 

=== modified file 'cinderclient/exceptions.py'
--- cinderclient/exceptions.py	2012-06-27 13:32:14 +0000
+++ cinderclient/exceptions.py	2013-01-10 22:15:27 +0000
@@ -124,16 +124,19 @@
 def from_response(response, body):
     """
     Return an instance of an ClientException or subclass
-    based on an httplib2 response.
+    based on an requests response.
 
     Usage::
 
-        resp, body = http.request(...)
-        if resp.status != 200:
-            raise exception_from_response(resp, body)
+        resp, body = requests.request(...)
+        if resp.status_code != 200:
+            raise exception_from_response(resp, rest.text)
     """
-    cls = _code_map.get(response.status, ClientException)
-    request_id = response.get('x-compute-request-id')
+    cls = _code_map.get(response.status_code, ClientException)
+    if response.headers:
+        request_id = response.headers.get('x-compute-request-id')
+    else:
+        request_id = None
     if body:
         message = "n/a"
         details = "n/a"
@@ -141,7 +144,7 @@
             error = body[body.keys()[0]]
             message = error.get('message', None)
             details = error.get('details', None)
-        return cls(code=response.status, message=message, details=details,
+        return cls(code=response.status_code, message=message, details=details,
                    request_id=request_id)
     else:
-        return cls(code=response.status, request_id=request_id)
+        return cls(code=response.status_code, request_id=request_id)

=== modified file 'cinderclient/openstack/common/setup.py'
--- cinderclient/openstack/common/setup.py	2012-08-16 12:03:50 +0000
+++ cinderclient/openstack/common/setup.py	2013-01-10 22:15:27 +0000
@@ -31,13 +31,13 @@
 def parse_mailmap(mailmap='.mailmap'):
     mapping = {}
     if os.path.exists(mailmap):
-        fp = open(mailmap, 'r')
-        for l in fp:
-            l = l.strip()
-            if not l.startswith('#') and ' ' in l:
-                canonical_email, alias = [x for x in l.split(' ')
-                                          if x.startswith('<')]
-                mapping[alias] = canonical_email
+        with open(mailmap, 'r') as fp:
+            for l in fp:
+                l = l.strip()
+                if not l.startswith('#') and ' ' in l:
+                    canonical_email, alias = [x for x in l.split(' ')
+                                              if x.startswith('<')]
+                    mapping[alias] = canonical_email
     return mapping
 
 
@@ -52,10 +52,10 @@
 
 # Get requirements from the first file that exists
 def get_reqs_from_files(requirements_files):
-    reqs_in = []
     for requirements_file in requirements_files:
         if os.path.exists(requirements_file):
-            return open(requirements_file, 'r').read().split('\n')
+            with open(requirements_file, 'r') as fil:
+                return fil.read().split('\n')
     return []
 
 
@@ -117,8 +117,12 @@
 
 
 def _run_shell_command(cmd):
-    output = subprocess.Popen(["/bin/sh", "-c", cmd],
-                              stdout=subprocess.PIPE)
+    if os.name == 'nt':
+        output = subprocess.Popen(["cmd.exe", "/C", cmd],
+                                  stdout=subprocess.PIPE)
+    else:
+        output = subprocess.Popen(["/bin/sh", "-c", cmd],
+                                  stdout=subprocess.PIPE)
     out = output.communicate()
     if len(out) == 0:
         return None
@@ -136,11 +140,19 @@
     _run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*")
     milestone_cmd = "git show meta/openstack/release:%s" % branch_name
     milestonever = _run_shell_command(milestone_cmd)
-    if not milestonever:
-        milestonever = ""
+    if milestonever:
+        first_half = "%s~%s" % (milestonever, datestamp)
+    else:
+        first_half = datestamp
+
     post_version = _get_git_post_version()
-    revno = post_version.split(".")[-1]
-    return "%s~%s.%s%s" % (milestonever, datestamp, revno_prefix, revno)
+    # post version should look like:
+    # 0.1.1.4.gcc9e28a
+    # where the bit after the last . is the short sha, and the bit between
+    # the last and second to last is the revno count
+    (revno, sha) = post_version.split(".")[-2:]
+    second_half = "%s%s.%s" % (revno_prefix, revno, sha)
+    return ".".join((first_half, second_half))
 
 
 def _get_git_current_tag():
@@ -162,39 +174,48 @@
             cmd = "git --no-pager log --oneline"
             out = _run_shell_command(cmd)
             revno = len(out.split("\n"))
+            sha = _run_shell_command("git describe --always")
         else:
             tag_infos = tag_info.split("-")
             base_version = "-".join(tag_infos[:-2])
-            revno = tag_infos[-2]
-        return "%s.%s" % (base_version, revno)
+            (revno, sha) = tag_infos[-2:]
+        return "%s.%s.%s" % (base_version, revno, sha)
 
 
 def write_git_changelog():
     """Write a changelog based on the git changelog."""
-    if os.path.isdir('.git'):
-        git_log_cmd = 'git log --stat'
-        changelog = _run_shell_command(git_log_cmd)
-        mailmap = parse_mailmap()
-        with open("ChangeLog", "w") as changelog_file:
-            changelog_file.write(canonicalize_emails(changelog, mailmap))
+    new_changelog = 'ChangeLog'
+    if not os.getenv('SKIP_WRITE_GIT_CHANGELOG'):
+        if os.path.isdir('.git'):
+            git_log_cmd = 'git log --stat'
+            changelog = _run_shell_command(git_log_cmd)
+            mailmap = parse_mailmap()
+            with open(new_changelog, "w") as changelog_file:
+                changelog_file.write(canonicalize_emails(changelog, mailmap))
+    else:
+        open(new_changelog, 'w').close()
 
 
 def generate_authors():
     """Create AUTHORS file using git commits."""
-    jenkins_email = '[e-mail]'
+    jenkins_email = 'jenkins@review.(openstack|stackforge).org'
     old_authors = 'AUTHORS.in'
     new_authors = 'AUTHORS'
-    if os.path.isdir('.git'):
-        # don't include jenkins email address in AUTHORS file
-        git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | "
-                       "grep -v " + jenkins_email)
-        changelog = _run_shell_command(git_log_cmd)
-        mailmap = parse_mailmap()
-        with open(new_authors, 'w') as new_authors_fh:
-            new_authors_fh.write(canonicalize_emails(changelog, mailmap))
-            if os.path.exists(old_authors):
-                with open(old_authors, "r") as old_authors_fh:
-                    new_authors_fh.write('\n' + old_authors_fh.read())
+    if not os.getenv('SKIP_GENERATE_AUTHORS'):
+        if os.path.isdir('.git'):
+            # don't include jenkins email address in AUTHORS file
+            git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | "
+                           "egrep -v '" + jenkins_email + "'")
+            changelog = _run_shell_command(git_log_cmd)
+            mailmap = parse_mailmap()
+            with open(new_authors, 'w') as new_authors_fh:
+                new_authors_fh.write(canonicalize_emails(changelog, mailmap))
+                if os.path.exists(old_authors):
+                    with open(old_authors, "r") as old_authors_fh:
+                        new_authors_fh.write('\n' + old_authors_fh.read())
+    else:
+        open(new_authors, 'w').close()
+
 
 _rst_template = """%(heading)s
 %(underline)s
@@ -206,9 +227,24 @@
 """
 
 
+def read_versioninfo(project):
+    """Read the versioninfo file. If it doesn't exist, we're in a github
+       zipball, and there's really no way to know what version we really
+       are, but that should be ok, because the utility of that should be
+       just about nil if this code path is in use in the first place."""
+    versioninfo_path = os.path.join(project, 'versioninfo')
+    if os.path.exists(versioninfo_path):
+        with open(versioninfo_path, 'r') as vinfo:
+            version = vinfo.read().strip()
+    else:
+        version = None
+    return version
+
+
 def write_versioninfo(project, version):
     """Write a simple file containing the version of the package."""
-    open(os.path.join(project, 'versioninfo'), 'w').write("%s\n" % version)
+    with open(os.path.join(project, 'versioninfo'), 'w') as fil:
+        fil.write("%s\n" % version)
 
 
 def get_cmdclass():
@@ -299,8 +335,10 @@
 
 
 def get_pre_version(projectname, base_version):
-    """Return a version which is based"""
-    if os.path.isdir('.git'):
+    """Return a version which is leading up to a version that will
+       be released in the future."""
+    version = read_versioninfo(projectname)
+    if not version and os.path.isdir('.git'):
         current_tag = _get_git_current_tag()
         if current_tag is not None:
             version = current_tag
@@ -311,11 +349,9 @@
             version_suffix = _get_git_next_version_suffix(branch_name)
             version = "%s~%s" % (base_version, version_suffix)
         write_versioninfo(projectname, version)
-        return version.split('~')[0]
-    else:
-        with open(os.path.join(projectname, 'versioninfo'), 'r') as vinfo:
-            full_version = vinfo.read().strip()
-            return full_version.split('~')[0]
+    if not version:
+        version = "0.0.0"
+    return version
 
 
 def get_post_version(projectname):
@@ -323,8 +359,10 @@
     revision if there is one, or tag plus number of additional revisions
     if the current revision has no tag."""
 
-    if os.path.isdir('.git'):
+    version = read_versioninfo(projectname)
+    if not version and os.path.isdir('.git'):
         version = _get_git_post_version()
         write_versioninfo(projectname, version)
-        return version
-    return open(os.path.join(projectname, 'versioninfo'), 'r').read().strip()
+    if not version:
+        version = "0.0.0"
+    return version

=== added file 'cinderclient/openstack/common/version.py'
--- cinderclient/openstack/common/version.py	1970-01-01 00:00:00 +0000
+++ cinderclient/openstack/common/version.py	2013-01-10 22:15:27 +0000
@@ -0,0 +1,148 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2012 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+Utilities for consuming the auto-generated versioninfo files.
+"""
+
+import datetime
+import pkg_resources
+
+import setup
+
+
+class _deferred_version_string(object):
+    """Internal helper class which provides delayed version calculation."""
+    def __init__(self, version_info, prefix):
+        self.version_info = version_info
+        self.prefix = prefix
+
+    def __str__(self):
+        return "%s%s" % (self.prefix, self.version_info.version_string())
+
+    def __repr__(self):
+        return "%s%s" % (self.prefix, self.version_info.version_string())
+
+
+class VersionInfo(object):
+
+    def __init__(self, package, python_package=None, pre_version=None):
+        """Object that understands versioning for a package
+        :param package: name of the top level python namespace. For glance,
+                        this would be "glance" for python-glanceclient, it
+                        would be "glanceclient"
+        :param python_package: optional name of the project name. For
+                               glance this can be left unset. For
+                               python-glanceclient, this would be
+                               "python-glanceclient"
+        :param pre_version: optional version that the project is working to
+        """
+        self.package = package
+        if python_package is None:
+            self.python_package = package
+        else:
+            self.python_package = python_package
+        self.pre_version = pre_version
+        self.version = None
+
+    def _generate_version(self):
+        """Defer to the openstack.common.setup routines for making a
+        version from git."""
+        if self.pre_version is None:
+            return setup.get_post_version(self.python_package)
+        else:
+            return setup.get_pre_version(self.python_package, self.pre_version)
+
+    def _newer_version(self, pending_version):
+        """Check to see if we're working with a stale version or not.
+        We expect a version string that either looks like:
+          2012.2~f3~20120708.10.4426392
+        which is an unreleased version of a pre-version, or:
+          0.1.1.4.gcc9e28a
+        which is an unreleased version of a post-version, or:
+          0.1.1
+        Which is a release and which should match tag.
+        For now, if we have a date-embedded version, check to see if it's
+        old, and if so re-generate. Otherwise, just deal with it.
+        """
+        try:
+            version_date = int(self.version.split("~")[-1].split('.')[0])
+            if version_date < int(datetime.date.today().strftime('%Y%m%d')):
+                return self._generate_version()
+            else:
+                return pending_version
+        except Exception:
+            return pending_version
+
+    def version_string_with_vcs(self, always=False):
+        """Return the full version of the package including suffixes indicating
+        VCS status.
+
+        For instance, if we are working towards the 2012.2 release,
+        canonical_version_string should return 2012.2 if this is a final
+        release, or else something like 2012.2~f1~20120705.20 if it's not.
+
+        :param always: if true, skip all version caching
+        """
+        if always:
+            self.version = self._generate_version()
+
+        if self.version is None:
+
+            requirement = pkg_resources.Requirement.parse(self.python_package)
+            versioninfo = "%s/versioninfo" % self.package
+            try:
+                raw_version = pkg_resources.resource_string(requirement,
+                                                            versioninfo)
+                self.version = self._newer_version(raw_version.strip())
+            except (IOError, pkg_resources.DistributionNotFound):
+                self.version = self._generate_version()
+
+        return self.version
+
+    def canonical_version_string(self, always=False):
+        """Return the simple version of the package excluding any suffixes.
+
+        For instance, if we are working towards the 2012.2 release,
+        canonical_version_string should return 2012.2 in all cases.
+
+        :param always: if true, skip all version caching
+        """
+        return self.version_string_with_vcs(always).split('~')[0]
+
+    def version_string(self, always=False):
+        """Return the base version of the package.
+
+        For instance, if we are working towards the 2012.2 release,
+        version_string should return 2012.2 if this is a final release, or
+        2012.2-dev if it is not.
+
+        :param always: if true, skip all version caching
+        """
+        version_parts = self.version_string_with_vcs(always).split('~')
+        if len(version_parts) == 1:
+            return version_parts[0]
+        else:
+            return '%s-dev' % (version_parts[0],)
+
+    def deferred_version_string(self, prefix=""):
+        """Generate an object which will expand in a string context to
+        the results of version_string(). We do this so that don't
+        call into pkg_resources every time we start up a program when
+        passing version information into the CONF constructor, but
+        rather only do the calculation when and if a version is requested
+        """
+        return _deferred_version_string(self, prefix)

=== modified file 'cinderclient/shell.py'
--- cinderclient/shell.py	2012-09-07 11:35:32 +0000
+++ cinderclient/shell.py	2013-01-10 22:15:27 +0000
@@ -20,7 +20,6 @@
 
 import argparse
 import glob
-import httplib2
 import imp
 import itertools
 import os
@@ -81,8 +80,9 @@
                             help=argparse.SUPPRESS)
 
         parser.add_argument('--debug',
-                            default=False,
                             action='store_true',
+                            default=utils.env('CINDERCLIENT_DEBUG',
+                                              default=False),
                             help="Print debugging output")
 
         parser.add_argument('--os-username',
@@ -163,12 +163,25 @@
         parser.add_argument('--os_volume_api_version',
                             help=argparse.SUPPRESS)
 
+        parser.add_argument('--os-cacert',
+                            metavar='<ca-certificate>',
+                            default=utils.env('OS_CACERT', default=None),
+                            help='Specify a CA bundle file to use in '
+                            'verifying a TLS (https) server certificate. '
+                            'Defaults to env[OS_CACERT]')
+
         parser.add_argument('--insecure',
                             default=utils.env('CINDERCLIENT_INSECURE',
                                               default=False),
                             action='store_true',
                             help=argparse.SUPPRESS)
 
+        parser.add_argument('--retries',
+                            metavar='<retries>',
+                            type=int,
+                            default=0,
+                            help='Number of retries.')
+
         # FIXME(dtroyer): The args below are here for diablo compatibility,
         #                 remove them in folsum cycle
 
@@ -301,8 +314,6 @@
         logger.setLevel(logging.DEBUG)
         logger.addHandler(streamhandler)
 
-        httplib2.debuglevel = 1
-
     def main(self, argv):
         # Parse args once to find version and debug settings
         parser = self.get_base_parser()
@@ -318,7 +329,7 @@
             options.os_volume_api_version)
         self.parser = subcommand_parser
 
-        if options.help and len(args) == 0:
+        if options.help or not argv:
             subcommand_parser.print_help()
             return 0
 
@@ -336,14 +347,14 @@
         (os_username, os_password, os_tenant_name, os_auth_url,
          os_region_name, endpoint_type, insecure,
          service_type, service_name, volume_service_name,
-         username, apikey, projectid, url, region_name) = (
+         username, apikey, projectid, url, region_name, cacert) = (
              args.os_username, args.os_password,
              args.os_tenant_name, args.os_auth_url,
              args.os_region_name, args.endpoint_type,
              args.insecure, args.service_type, args.service_name,
              args.volume_service_name, args.username,
              args.apikey, args.projectid,
-             args.url, args.region_name)
+             args.url, args.region_name, args.os_cacert)
 
         if not endpoint_type:
             endpoint_type = DEFAULT_CINDER_ENDPOINT_TYPE
@@ -408,7 +419,10 @@
                                 extensions=self.extensions,
                                 service_type=service_type,
                                 service_name=service_name,
-                                volume_service_name=volume_service_name)
+                                volume_service_name=volume_service_name,
+                                retries=options.retries,
+                                http_log_debug=args.debug,
+                                cacert=cacert)
 
         try:
             if not utils.isunauthenticated(args.func):

=== modified file 'cinderclient/utils.py'
--- cinderclient/utils.py	2012-06-27 13:32:14 +0000
+++ cinderclient/utils.py	2013-01-10 22:15:27 +0000
@@ -1,3 +1,4 @@
+import locale
 import os
 import re
 import sys
@@ -179,12 +180,19 @@
             return manager.find(name=name_or_id)
         except exceptions.NotFound:
             try:
-                # Volumes does not have name, but display_name
-                return manager.find(display_name=name_or_id)
-            except exceptions.NotFound:
-                msg = "No %s with a name or ID of '%s' exists." % \
-                    (manager.resource_class.__name__.lower(), name_or_id)
-                raise exceptions.CommandError(msg)
+                # For command-line arguments that are in Unicode
+                encoding = (locale.getpreferredencoding() or
+                            sys.stdin.encoding or
+                            'UTF-8')
+                return manager.find(display_name=(name_or_id.decode(encoding)))
+            except (UnicodeDecodeError, exceptions.NotFound):
+                try:
+                    # Volumes does not have name, but display_name
+                    return manager.find(display_name=name_or_id)
+                except exceptions.NotFound:
+                    msg = "No %s with a name or ID of '%s' exists." % \
+                        (manager.resource_class.__name__.lower(), name_or_id)
+                    raise exceptions.CommandError(msg)
     except exceptions.NoUniqueMatch:
         msg = ("Multiple %s matches found for '%s', use an ID to be more"
                " specific." % (manager.resource_class.__name__.lower(),

=== modified file 'cinderclient/v1/client.py'
--- cinderclient/v1/client.py	2012-10-01 12:05:26 +0000
+++ cinderclient/v1/client.py	2013-01-10 22:15:27 +0000
@@ -17,9 +17,7 @@
 
     Then call methods on its managers::
 
-        >>> client.servers.list()
-        ...
-        >>> client.flavors.list()
+        >>> client.volumes.list()
         ...
 
     """
@@ -29,7 +27,9 @@
                  proxy_tenant_id=None, proxy_token=None, region_name=None,
                  endpoint_type='publicURL', extensions=None,
                  service_type='volume', service_name=None,
-                 volume_service_name=None):
+                 volume_service_name=None, retries=None,
+                 http_log_debug=False,
+                 cacert=None):
         # FIXME(comstud): Rename the api_key argument above when we
         # know it's not being used as keyword argument
         password = api_key
@@ -63,7 +63,10 @@
             endpoint_type=endpoint_type,
             service_type=service_type,
             service_name=service_name,
-            volume_service_name=volume_service_name)
+            volume_service_name=volume_service_name,
+            retries=retries,
+            http_log_debug=http_log_debug,
+            cacert=cacert)
 
     def authenticate(self):
         """

=== added file 'cinderclient/v1/contrib/list_extensions.py'
--- cinderclient/v1/contrib/list_extensions.py	1970-01-01 00:00:00 +0000
+++ cinderclient/v1/contrib/list_extensions.py	2013-01-10 22:15:27 +0000
@@ -0,0 +1,47 @@
+# Copyright 2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from cinderclient import base
+from cinderclient import utils
+
+
+class ListExtResource(base.Resource):
+    @property
+    def summary(self):
+        descr = self.description.strip()
+        if not descr:
+            return '??'
+        lines = descr.split("\n")
+        if len(lines) == 1:
+            return lines[0]
+        else:
+            return lines[0] + "..."
+
+
+class ListExtManager(base.Manager):
+    resource_class = ListExtResource
+
+    def show_all(self):
+        return self._list("/extensions", 'extensions')
+
+
[e-mail]_type('volume')
+def do_list_extensions(client, _args):
+    """
+    List all the os-api extensions that are available.
+    """
+    extensions = client.list_extensions.show_all()
+    fields = ["Name", "Summary", "Alias", "Updated"]
+    utils.print_list(extensions, fields)

=== modified file 'cinderclient/v1/shell.py'
--- cinderclient/v1/shell.py	2012-10-01 12:05:26 +0000
+++ cinderclient/v1/shell.py	2013-01-10 22:15:27 +0000
@@ -20,6 +20,7 @@
 import sys
 import time
 
+from cinderclient import exceptions
 from cinderclient import utils
 
 
@@ -91,14 +92,17 @@
                 setattr(item, to_key, item._info[from_key])
 
 
-def _extract_metadata(arg_list):
+def _extract_metadata(args):
     metadata = {}
-    for metadatum in arg_list:
-        assert(metadatum.find('=') > -1), "Improperly formatted metadata "\
-                                          "input (%s)" % metadatum
-        (key, value) = metadatum.split('=', 1)
+    for metadatum in args.metadata[0]:
+        # unset doesn't require a val, so we have the if/else
+        if '=' in metadatum:
+            (key, value) = metadatum.split('=', 1)
+        else:
+            key = metadatum
+            value = None
+
         metadata[key] = value
-
     return metadata
 
 
@@ -144,7 +148,7 @@
         servers = [s.get('server_id') for s in vol.attachments]
         setattr(vol, 'attached_to', ','.join(map(str, servers)))
     utils.print_list(volumes, ['ID', 'Status', 'Display Name',
-                     'Size', 'Volume Type', 'Attached to'])
+                     'Size', 'Volume Type', 'Bootable', 'Attached to'])
 
 
 @utils.arg('volume', metavar='<volume>', help='ID of the volume.')
@@ -168,6 +172,14 @@
     '--snapshot_id',
     help=argparse.SUPPRESS)
 @utils.arg(
+    '--source-volid',
+    metavar='<source-volid>',
+    default=None,
+    help='Create volume from volume id (Optional, Default=None)')
[e-mail](
+    '--source_volid',
+    help=argparse.SUPPRESS)
[e-mail](
     '--image-id',
     metavar='<image-id>',
     default=None,
@@ -219,10 +231,11 @@
 
     volume_metadata = None
     if args.metadata is not None:
-        volume_metadata = _extract_metadata(args.metadata)
+        volume_metadata = _extract_metadata(args)
 
     volume = cs.volumes.create(args.size,
                                args.snapshot_id,
+                               args.source_volid,
                                args.display_name,
                                args.display_description,
                                args.volume_type,
@@ -240,6 +253,48 @@
     volume.delete()
 
 
[e-mail]('volume', metavar='<volume>', help='ID of the volume to rename.')
[e-mail]('display_name', nargs='?', metavar='<display-name>',
+           help='New display-name for the volume.')
[e-mail]('--display-description', metavar='<display-description>',
+           help='Optional volume description. (Default=None)',
+           default=None)
[e-mail]_type('volume')
+def do_rename(cs, args):
+    """Rename a volume."""
+    kwargs = {}
+    if args.display_name is not None:
+        kwargs['display_name'] = args.display_name
+    if args.display_description is not None:
+        kwargs['display_description'] = args.display_description
+    _find_volume(cs, args.volume).update(**kwargs)
+
+
[e-mail]('volume',
+           metavar='<volume>',
+           help='ID of the volume to update metadata on.')
[e-mail]('action',
+           metavar='<action>',
+           choices=['set', 'unset'],
+           help="Actions: 'set' or 'unset'")
[e-mail]('metadata',
+           metavar='<key=value>',
+           nargs='+',
+           action='append',
+           default=[],
+           help='Metadata to set/unset (only key is necessary on unset)')
[e-mail]_type('volume')
+def do_metadata(cs, args):
+    """Set or Delete metadata on a volume."""
+    volume = _find_volume(cs, args.volume)
+    metadata = _extract_metadata(args)
+
+    if args.action == 'set':
+        cs.volumes.set_metadata(volume, metadata)
+    elif args.action == 'unset':
+        cs.volumes.delete_metadata(volume, metadata.keys())
+
+
 @utils.arg(
     '--all-tenants',
     dest='all_tenants',
@@ -340,10 +395,32 @@
     snapshot.delete()
 
 
[e-mail]('snapshot', metavar='<snapshot>', help='ID of the snapshot.')
[e-mail]('display_name', nargs='?', metavar='<display-name>',
+           help='New display-name for the snapshot.')
[e-mail]('--display-description', metavar='<display-description>',
+           help='Optional snapshot description. (Default=None)',
+           default=None)
[e-mail]_type('volume')
+def do_snapshot_rename(cs, args):
+    """Rename a snapshot."""
+    kwargs = {}
+    if args.display_name is not None:
+        kwargs['display_name'] = args.display_name
+    if args.display_description is not None:
+        kwargs['display_description'] = args.display_description
+    _find_volume_snapshot(cs, args.snapshot).update(**kwargs)
+
+
 def _print_volume_type_list(vtypes):
     utils.print_list(vtypes, ['ID', 'Name'])
 
 
+def _print_type_and_extra_specs_list(vtypes):
+    formatters = {'extra_specs': _print_type_extra_specs}
+    utils.print_list(vtypes, ['ID', 'Name', 'extra_specs'], formatters)
+
+
 @utils.service_type('volume')
 def do_type_list(cs, args):
     """Print a list of available 'volume types'."""
@@ -351,9 +428,16 @@
     _print_volume_type_list(vtypes)
 
 
[e-mail]_type('volume')
+def do_extra_specs_list(cs, args):
+    """Print a list of current 'volume types and extra specs' (Admin Only)."""
+    vtypes = cs.volume_types.list()
+    _print_type_and_extra_specs_list(vtypes)
+
+
 @utils.arg('name',
            metavar='<name>',
-           help="Name of the new flavor")
+           help="Name of the new volume type")
 @utils.service_type('volume')
 def do_type_create(cs, args):
     """Create a new volume type."""
@@ -366,10 +450,35 @@
            help="Unique ID of the volume type to delete")
 @utils.service_type('volume')
 def do_type_delete(cs, args):
-    """Delete a specific flavor"""
+    """Delete a specific volume type"""
     cs.volume_types.delete(args.id)
 
 
[e-mail]('vtype',
+           metavar='<vtype>',
+           help="Name or ID of the volume type")
[e-mail]('action',
+           metavar='<action>',
+           choices=['set', 'unset'],
+           help="Actions: 'set' or 'unset'")
[e-mail]('metadata',
+           metavar='<key=value>',
+           nargs='+',
+           action='append',
+           default=[],
+           help='Extra_specs to set/unset (only key is necessary on unset)')
[e-mail]_type('volume')
+def do_type_key(cs, args):
+    "Set or unset extra_spec for a volume type."""
+    vtype = _find_volume_type(cs, args.vtype)
+    keypair = _extract_metadata(args)
+
+    if args.action == 'set':
+        vtype.set_keys(keypair)
+    elif args.action == 'unset':
+        vtype.unset_keys(keypair.keys())
+
+
 def do_endpoints(cs, args):
     """Discover endpoints that get returned from the authenticate services"""
     catalog = cs.client.service_catalog.catalog
@@ -479,3 +588,15 @@
     limits = cs.limits.get().rate
     columns = ['Verb', 'URI', 'Value', 'Remain', 'Unit', 'Next_Available']
     utils.print_list(limits, columns)
+
+
+def _print_type_extra_specs(vol_type):
+    try:
+        return vol_type.get_keys()
+    except exceptions.NotFound:
+        return "N/A"
+
+
+def _find_volume_type(cs, vtype):
+    """Get a volume type by name or ID."""
+    return utils.find_resource(cs.volume_types, vtype)

=== modified file 'cinderclient/v1/volume_snapshots.py'
--- cinderclient/v1/volume_snapshots.py	2012-10-01 12:05:26 +0000
+++ cinderclient/v1/volume_snapshots.py	2013-01-10 22:15:27 +0000
@@ -34,6 +34,12 @@
         """
         self.manager.delete(self)
 
+    def update(self, **kwargs):
+        """
+        Update the display_name or display_description for this snapshot.
+        """
+        self.manager.update(self, **kwargs)
+
     @property
     def progress(self):
         return self._info.get('os-extended-snapshot-attributes:progress')
@@ -109,3 +115,16 @@
         :param snapshot: The :class:`Snapshot` to delete.
         """
         self._delete("/snapshots/%s" % base.getid(snapshot))
+
+    def update(self, snapshot, **kwargs):
+        """
+        Update the display_name or display_description for a snapshot.
+
+        :param snapshot: The :class:`Snapshot` to delete.
+        """
+        if not kwargs:
+            return
+
+        body = {"snapshot": kwargs}
+
+        self._update("/snapshots/%s" % base.getid(snapshot), body)

=== modified file 'cinderclient/v1/volume_types.py'
--- cinderclient/v1/volume_types.py	2012-06-27 13:32:14 +0000
+++ cinderclient/v1/volume_types.py	2013-01-10 22:15:27 +0000
@@ -26,7 +26,52 @@
     A Volume Type is the type of volume to be created
     """
     def __repr__(self):
-        return "<Volume Type: %s>" % self.name
+        return "<VolumeType: %s>" % self.name
+
+    def get_keys(self):
+        """
+        Get extra specs from a volume type.
+
+        :param vol_type: The :class:`VolumeType` to get extra specs from
+        """
+        _resp, body = self.manager.api.client.get(
+            "/types/%s/extra_specs" %
+            base.getid(self))
+        return body["extra_specs"]
+
+    def set_keys(self, metadata):
+        """
+        Set extra specs on a volume type.
+
+        :param type : The :class:`VolumeType` to set extra spec on
+        :param metadata: A dict of key/value pairs to be set
+        """
+        body = {'extra_specs': metadata}
+        return self.manager._create(
+            "/types/%s/extra_specs" % base.getid(self),
+            body,
+            "extra_specs",
+            return_raw=True)
+
+    def unset_keys(self, keys):
+        """
+        Unset extra specs on a volue type.
+
+        :param type_id: The :class:`VolumeType` to unset extra spec on
+        :param keys: A list of keys to be unset
+        """
+
+        # NOTE(jdg): This wasn't actually doing all of the keys before
+        # the return in the loop resulted in ony ONE key being unset.
+        # since on success the return was NONE, we'll only interrupt the loop
+        # and return if there's an error
+        result = None
+        for k in keys:
+            resp = self.manager._delete(
+                "/types/%s/extra_specs/%s" % (
+                base.getid(self), k))
+            if resp is not None:
+                return resp
 
 
 class VolumeTypeManager(base.ManagerWithFind):

=== modified file 'cinderclient/v1/volumes.py'
--- cinderclient/v1/volumes.py	2012-10-01 12:05:26 +0000
+++ cinderclient/v1/volumes.py	2013-01-10 22:15:27 +0000
@@ -34,6 +34,12 @@
         """
         self.manager.delete(self)
 
+    def update(self, **kwargs):
+        """
+        Update the display_name or display_description for this volume.
+        """
+        self.manager.update(self, **kwargs)
+
     def attach(self, instance_uuid, mountpoint):
         """
         Set attachment metadata.
@@ -89,6 +95,15 @@
         """
         return self.manager.terminate_connection(self, connector)
 
+    def set_metadata(self, volume, metadata):
+        """
+        Set or Append metadata to a volume.
+
+        :param type : The :class: `Volume` to set metadata on
+        :param metadata: A dict of key/value pairs to set
+        """
+        return self.manager.set_metadata(self, metadata)
+
 
 class VolumeManager(base.ManagerWithFind):
     """
@@ -96,7 +111,7 @@
     """
     resource_class = Volume
 
-    def create(self, size, snapshot_id=None,
+    def create(self, size, snapshot_id=None, source_volid=None,
                display_name=None, display_description=None,
                volume_type=None, user_id=None,
                project_id=None, availability_zone=None,
@@ -115,6 +130,7 @@
         :param availability_zone: Availability Zone to use
         :param metadata: Optional metadata to set on volume creation
         :param imageRef: reference to an image stored in glance
+        :param source_volid: ID of source volume to clone from
         """
 
         if metadata is None:
@@ -134,6 +150,7 @@
                            'attach_status': "detached",
                            'metadata': volume_metadata,
                            'imageRef': imageRef,
+                           'source_volid': source_volid,
                            }}
         return self._create('/volumes', body, 'volume')
 
@@ -178,51 +195,18 @@
         """
         self._delete("/volumes/%s" % base.getid(volume))
 
-    def create_server_volume(self, server_id, volume_id, device):
-        """
-        Attach a volume identified by the volume ID to the given server ID
-
-        :param server_id: The ID of the server
-        :param volume_id: The ID of the volume to attach.
-        :param device: The device name
-        :rtype: :class:`Volume`
-        """
-        body = {'volumeAttachment': {'volumeId': volume_id,
-                                     'device': device}}
-        return self._create("/servers/%s/os-volume_attachments" % server_id,
-                            body, "volumeAttachment")
-
-    def get_server_volume(self, server_id, attachment_id):
-        """
-        Get the volume identified by the attachment ID, that is attached to
-        the given server ID
-
-        :param server_id: The ID of the server
-        :param attachment_id: The ID of the attachment
-        :rtype: :class:`Volume`
-        """
-        return self._get("/servers/%s/os-volume_attachments/%s" % (server_id,
-                         attachment_id,), "volumeAttachment")
-
-    def get_server_volumes(self, server_id):
-        """
-        Get a list of all the attached volumes for the given server ID
-
-        :param server_id: The ID of the server
-        :rtype: list of :class:`Volume`
-        """
-        return self._list("/servers/%s/os-volume_attachments" % server_id,
-                          "volumeAttachments")
-
-    def delete_server_volume(self, server_id, attachment_id):
-        """
-        Detach a volume identified by the attachment ID from the given server
-
-        :param server_id: The ID of the server
-        :param attachment_id: The ID of the attachment
-        """
-        self._delete("/servers/%s/os-volume_attachments/%s" %
-                     (server_id, attachment_id,))
+    def update(self, volume, **kwargs):
+        """
+        Update the display_name or display_description for a volume.
+
+        :param volume: The :class:`Volume` to delete.
+        """
+        if not kwargs:
+            return
+
+        body = {"volume": kwargs}
+
+        self._update("/volumes/%s" % base.getid(volume), body)
 
     def _action(self, action, volume, info=None, **kwargs):
         """
@@ -311,3 +295,24 @@
         """
         self._action('os-terminate_connection', volume,
                      {'connector': connector})
+
+    def set_metadata(self, volume, metadata):
+        """
+        Update/Set a volumes metadata.
+
+        :param volume: The :class:`Volume`.
+        :param metadata: A list of keys to be set.
+        """
+        body = {'metadata': metadata}
+        return self._create("/volumes/%s/metadata" % base.getid(volume),
+                            body, "metadata")
+
+    def delete_metadata(self, volume, keys):
+        """
+        Delete specified keys from volumes metadata.
+
+        :param volume: The :class:`Volume`.
+        :param metadata: A list of keys to be removed.
+        """
+        for k in keys:
+            self._delete("/volumes/%s/metadata/%s" % (base.getid(volume), k))

=== modified file 'cinderclient/versioninfo'
--- cinderclient/versioninfo	2012-10-01 12:05:26 +0000
+++ cinderclient/versioninfo	2013-01-10 22:15:27 +0000
@@ -1,1 +1,1 @@
-1.0.0
+1.0.2.3.g61e2a42

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-01 12:11:12 +0000
+++ debian/changelog	2013-01-10 22:15:27 +0000
@@ -1,3 +1,25 @@
+python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 10 Jan 2013 14:13:47 -0800
+
+python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * New upstream release.
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/control: Add python-requests as a build dep
+  * debian/control: Add python-testtools and python-fixtures as a build dep.
+
+  [ Yolanda Robla ]
+  * debian/control: add python-setuptools-git dependency
+  * debian/copyright: Removed remaining dh boilerplate template.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 10 Jan 2013 11:35:58 -0800
+
 python-cinderclient (1:1.0.0-0ubuntu1~cloud0) precise-folsom; urgency=low
 
   * New upstream release for the Ubuntu Cloud Archive. 

=== modified file 'debian/control'
--- debian/control	2012-10-01 12:05:26 +0000
+++ debian/control	2013-01-10 22:15:27 +0000
@@ -6,19 +6,23 @@
  python-setuptools,
  python-nose,
  python-httplib2,
+ python-requests,
  python-prettytable,
  python-simplejson,
  python-mock,
  pep8,
  python-sphinx,
- python-unittest2
+ python-unittest2,
+ python-setuptools-git (>= 0.4),
+ python-testtools,
+ python-fixtures
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 
 Package: python-cinderclient
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
- python-prettytable, python-simplejson
+ python-prettytable, python-requests, python-simplejson
 Description: python bindings to the OpenStack Volume API
  This is a client for the OpenStack Volume API. There's a Python API (the
  ``cinderclient`` module), and a command-line script (``cinder``). Each

=== modified file 'debian/copyright'
--- debian/copyright	2012-06-27 13:32:14 +0000
+++ debian/copyright	2013-01-10 22:15:27 +0000
@@ -41,8 +41,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

=== added file 'openstack-common.conf'
--- openstack-common.conf	1970-01-01 00:00:00 +0000
+++ openstack-common.conf	2013-01-10 22:15:27 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+
+# The list of modules to copy from openstack-common
+modules=setup,version
+
+# The base module to hold the copy of openstack.common
+base=cinderclient

=== modified file 'python_cinderclient.egg-info/PKG-INFO'
--- python_cinderclient.egg-info/PKG-INFO	2012-10-01 12:05:26 +0000
+++ python_cinderclient.egg-info/PKG-INFO	2013-01-10 22:15:27 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-cinderclient
-Version: 1.0.0
+Version: 1.0.2.3.g61e2a42
 Summary: Client library for OpenStack Cinder API.
 Home-page: https://github.com/openstack/python-cinderclient
 Author: Rackspace, based on work by Jacob Kaplan-Moss
@@ -161,6 +161,7 @@
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
+Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: Apache Software License

=== modified file 'python_cinderclient.egg-info/SOURCES.txt'
--- python_cinderclient.egg-info/SOURCES.txt	2012-10-01 12:05:26 +0000
+++ python_cinderclient.egg-info/SOURCES.txt	2013-01-10 22:15:27 +0000
@@ -1,5 +1,3 @@
-.gitignore
-.gitreview
 .mailmap
 AUTHORS
 ChangeLog
@@ -7,6 +5,7 @@
 LICENSE
 MANIFEST.in
 README.rst
+openstack-common.conf
 run_tests.sh
 setup.cfg
 setup.py
@@ -23,6 +22,7 @@
 cinderclient/openstack/__init__.py
 cinderclient/openstack/common/__init__.py
 cinderclient/openstack/common/setup.py
+cinderclient/openstack/common/version.py
 cinderclient/v1/__init__.py
 cinderclient/v1/client.py
 cinderclient/v1/limits.py
@@ -33,6 +33,7 @@
 cinderclient/v1/volume_types.py
 cinderclient/v1/volumes.py
 cinderclient/v1/contrib/__init__.py
+cinderclient/v1/contrib/list_extensions.py
 doc/.gitignore
 doc/Makefile
 doc/source/api.rst
@@ -68,9 +69,12 @@
 tests/v1/test_quota_classes.py
 tests/v1/test_quotas.py
 tests/v1/test_shell.py
+tests/v1/test_types.py
 tests/v1/test_volumes.py
 tests/v1/testfile.txt
 tests/v1/utils.py
+tests/v1/contrib/__init__.py
+tests/v1/contrib/test_list_extensions.py
 tools/cinder.bash_completion
 tools/generate_authors.sh
 tools/install_venv.py

=== modified file 'python_cinderclient.egg-info/requires.txt'
--- python_cinderclient.egg-info/requires.txt	2012-08-16 12:03:50 +0000
+++ python_cinderclient.egg-info/requires.txt	2013-01-10 22:15:27 +0000
@@ -1,3 +1,3 @@
-httplib2
 prettytable
+requests<1.0
 simplejson
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2012-09-07 11:35:32 +0000
+++ setup.py	2013-01-10 22:15:27 +0000
@@ -21,6 +21,7 @@
 
 requires = setup.parse_requirements()
 depend_links = setup.parse_dependency_links()
+tests_require = setup.parse_requirements(['tools/test-requires'])
 
 
 def read_file(file_name):
@@ -39,12 +40,14 @@
     packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
     cmdclass=setup.get_cmdclass(),
     install_requires=requires,
+    tests_require=tests_require,
+    setup_requires=['setuptools-git>=0.4'],
     dependency_links=depend_links,
-    tests_require=["nose", "mock"],
     test_suite="nose.collector",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
+        "Environment :: OpenStack",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
         "License :: OSI Approved :: Apache Software License",

=== modified file 'tests/test_client.py'
--- tests/test_client.py	2012-06-27 13:32:14 +0000
+++ tests/test_client.py	2013-01-10 22:15:27 +0000
@@ -6,9 +6,6 @@
 
 class ClientTest(utils.TestCase):
 
-    def setUp(self):
-        pass
-
     def test_get_client_class_v1(self):
         output = cinderclient.client.get_client_class('1')
         self.assertEqual(output, cinderclient.v1.client.Client)

=== modified file 'tests/test_http.py'
--- tests/test_http.py	2012-06-27 13:32:14 +0000
+++ tests/test_http.py	2013-01-10 22:15:27 +0000
@@ -1,24 +1,45 @@
-import httplib2
 import mock
 
+import requests
+
 from cinderclient import client
 from cinderclient import exceptions
 from tests import utils
 
 
-fake_response = httplib2.Response({"status": 200})
-fake_body = '{"hi": "there"}'
-mock_request = mock.Mock(return_value=(fake_response, fake_body))
-
-
-def get_client():
+fake_response = utils.TestResponse({
+    "status_code": 200,
+    "text": '{"hi": "there"}',
+})
+mock_request = mock.Mock(return_value=(fake_response))
+
+bad_400_response = utils.TestResponse({
+    "status_code": 400,
+    "text": '{"error": {"message": "n/a", "details": "Terrible!"}}',
+})
+bad_400_request = mock.Mock(return_value=(bad_400_response))
+
+bad_401_response = utils.TestResponse({
+    "status_code": 401,
+    "text": '{"error": {"message": "FAILED!", "details": "DETAILS!"}}',
+})
+bad_401_request = mock.Mock(return_value=(bad_401_response))
+
+bad_500_response = utils.TestResponse({
+    "status_code": 500,
+    "text": '{"error": {"message": "FAILED!", "details": "DETAILS!"}}',
+})
+bad_500_request = mock.Mock(return_value=(bad_500_response))
+
+
+def get_client(retries=0):
     cl = client.HTTPClient("username", "password",
-                           "project_id", "auth_test")
+                           "project_id", "auth_test", retries=retries)
     return cl
 
 
-def get_authed_client():
-    cl = get_client()
+def get_authed_client(retries=0):
+    cl = get_client(retries=retries)
     cl.management_url = "http://example.com"
     cl.auth_token = "token"
     return cl
@@ -29,7 +50,7 @@
     def test_get(self):
         cl = get_authed_client()
 
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         @mock.patch('time.time', mock.Mock(return_value=1234))
         def test_get_call():
             resp, body = cl.get("/hi")
@@ -37,17 +58,110 @@
                        "X-Auth-Project-Id": "project_id",
                        "User-Agent": cl.USER_AGENT,
                        'Accept': 'application/json', }
-            mock_request.assert_called_with("http://example.com/hi",
-                                            "GET", headers=headers)
+            mock_request.assert_called_with(
+                "GET",
+                "http://example.com/hi",
+                headers=headers,
+                **self.TEST_REQUEST_BASE)
             # Automatic JSON parsing
             self.assertEqual(body, {"hi": "there"})
 
         test_get_call()
 
+    def test_get_reauth_0_retries(self):
+        cl = get_authed_client(retries=0)
+
+        self.requests = [bad_401_request, mock_request]
+
+        def request(*args, **kwargs):
+            next_request = self.requests.pop(0)
+            return next_request(*args, **kwargs)
+
+        def reauth():
+            cl.management_url = "http://example.com"
+            cl.auth_token = "token"
+
+        @mock.patch.object(cl, 'authenticate', reauth)
+        @mock.patch.object(requests, "request", request)
+        @mock.patch('time.time', mock.Mock(return_value=1234))
+        def test_get_call():
+            resp, body = cl.get("/hi")
+
+        test_get_call()
+        self.assertEqual(self.requests, [])
+
+    def test_get_retry_500(self):
+        cl = get_authed_client(retries=1)
+
+        self.requests = [bad_500_request, mock_request]
+
+        def request(*args, **kwargs):
+            next_request = self.requests.pop(0)
+            return next_request(*args, **kwargs)
+
+        @mock.patch.object(requests, "request", request)
+        @mock.patch('time.time', mock.Mock(return_value=1234))
+        def test_get_call():
+            resp, body = cl.get("/hi")
+
+        test_get_call()
+        self.assertEqual(self.requests, [])
+
+    def test_retry_limit(self):
+        cl = get_authed_client(retries=1)
+
+        self.requests = [bad_500_request, bad_500_request, mock_request]
+
+        def request(*args, **kwargs):
+            next_request = self.requests.pop(0)
+            return next_request(*args, **kwargs)
+
+        @mock.patch.object(requests, "request", request)
+        @mock.patch('time.time', mock.Mock(return_value=1234))
+        def test_get_call():
+            resp, body = cl.get("/hi")
+
+        self.assertRaises(exceptions.ClientException, test_get_call)
+        self.assertEqual(self.requests, [mock_request])
+
+    def test_get_no_retry_400(self):
+        cl = get_authed_client(retries=0)
+
+        self.requests = [bad_400_request, mock_request]
+
+        def request(*args, **kwargs):
+            next_request = self.requests.pop(0)
+            return next_request(*args, **kwargs)
+
+        @mock.patch.object(requests, "request", request)
+        @mock.patch('time.time', mock.Mock(return_value=1234))
+        def test_get_call():
+            resp, body = cl.get("/hi")
+
+        self.assertRaises(exceptions.BadRequest, test_get_call)
+        self.assertEqual(self.requests, [mock_request])
+
+    def test_get_retry_400_socket(self):
+        cl = get_authed_client(retries=1)
+
+        self.requests = [bad_400_request, mock_request]
+
+        def request(*args, **kwargs):
+            next_request = self.requests.pop(0)
+            return next_request(*args, **kwargs)
+
+        @mock.patch.object(requests, "request", request)
+        @mock.patch('time.time', mock.Mock(return_value=1234))
+        def test_get_call():
+            resp, body = cl.get("/hi")
+
+        test_get_call()
+        self.assertEqual(self.requests, [])
+
     def test_post(self):
         cl = get_authed_client()
 
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         def test_post_call():
             cl.post("/hi", body=[1, 2, 3])
             headers = {
@@ -57,8 +171,12 @@
                 'Accept': 'application/json',
                 "User-Agent": cl.USER_AGENT
             }
-            mock_request.assert_called_with("http://example.com/hi", "POST",
-                                            headers=headers, body='[1, 2, 3]')
+            mock_request.assert_called_with(
+                "POST",
+                "http://example.com/hi",
+                headers=headers,
+                data='[1, 2, 3]',
+                **self.TEST_REQUEST_BASE)
 
         test_post_call()
 
@@ -66,7 +184,7 @@
         cl = get_client()
 
         # response must not have x-server-management-url header
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             self.assertRaises(exceptions.AuthorizationFailure, cl.authenticate)
 

=== modified file 'tests/test_shell.py'
--- tests/test_shell.py	2012-06-27 13:32:14 +0000
+++ tests/test_shell.py	2013-01-10 22:15:27 +0000
@@ -1,8 +1,11 @@
 import cStringIO
 import os
-import httplib2
+import re
 import sys
 
+import fixtures
+from testtools import matchers
+
 from cinderclient import exceptions
 import cinderclient.shell
 from tests import utils
@@ -10,16 +13,19 @@
 
 class ShellTest(utils.TestCase):
 
+    FAKE_ENV = {
+        'OS_USERNAME': 'username',
+        'OS_PASSWORD': 'password',
+        'OS_TENANT_NAME': 'tenant_name',
+        'OS_AUTH_URL': 'http://no.where',
+    }
+
     # Patch os.environ to avoid required auth info.
     def setUp(self):
-        global _old_env
-        fake_env = {
-            'OS_USERNAME': 'username',
-            'OS_PASSWORD': 'password',
-            'OS_TENANT_NAME': 'tenant_name',
-            'OS_AUTH_URL': 'http://no.where',
-        }
-        _old_env, os.environ = os.environ, fake_env.copy()
+        super(ShellTest, self).setUp()
+        for var in self.FAKE_ENV:
+            self.useFixture(fixtures.EnvironmentVariable(var,
+                                                         self.FAKE_ENV[var]))
 
     def shell(self, argstr):
         orig = sys.stdout
@@ -37,39 +43,26 @@
 
         return out
 
-    def tearDown(self):
-        global _old_env
-        os.environ = _old_env
-
     def test_help_unknown_command(self):
         self.assertRaises(exceptions.CommandError, self.shell, 'help foofoo')
 
-    def test_debug(self):
-        httplib2.debuglevel = 0
-        self.shell('--debug help')
-        assert httplib2.debuglevel == 1
-
     def test_help(self):
         required = [
-            '^usage: ',
-            '(?m)^\s+create\s+Add a new volume.',
-            '(?m)^See "cinder help COMMAND" for help on a specific command',
+            '.*?^usage: ',
+            '.*?(?m)^\s+create\s+Add a new volume.',
+            '.*?(?m)^See "cinder help COMMAND" for help on a specific command',
         ]
-        for argstr in ['--help', 'help']:
-            help_text = self.shell(argstr)
-            for r in required:
-                self.assertRegexpMatches(help_text, r)
+        help_text = self.shell('help')
+        for r in required:
+            self.assertThat(help_text,
+                            matchers.MatchesRegex(r, re.DOTALL|re.MULTILINE))
 
     def test_help_on_subcommand(self):
         required = [
-            '^usage: cinder list',
-            '(?m)^List all the volumes.',
-        ]
-        argstrings = [
-            'list --help',
-            'help list',
-        ]
-        for argstr in argstrings:
-            help_text = self.shell(argstr)
-            for r in required:
-                self.assertRegexpMatches(help_text, r)
+            '.*?^usage: cinder list',
+            '.*?(?m)^List all the volumes.',
+        ]
+        help_text = self.shell('help list')
+        for r in required:
+            self.assertThat(help_text,
+                            matchers.MatchesRegex(r, re.DOTALL|re.MULTILINE))

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2012-06-27 13:32:14 +0000
+++ tests/test_utils.py	2013-01-10 22:15:27 +0000
@@ -45,6 +45,7 @@
 class FindResourceTestCase(test_utils.TestCase):
 
     def setUp(self):
+        super(FindResourceTestCase, self).setUp()
         self.manager = FakeManager(None)
 
     def test_find_none(self):

=== modified file 'tests/utils.py'
--- tests/utils.py	2012-06-27 13:32:14 +0000
+++ tests/utils.py	2013-01-10 22:15:27 +0000
@@ -1,5 +1,33 @@
-import unittest2
-
-
-class TestCase(unittest2.TestCase):
-    pass
+import testtools
+
+import requests
+
+
+class TestCase(testtools.TestCase):
+    TEST_REQUEST_BASE = {
+        'config': {'danger_mode': False},
+        'verify': True,
+    }
+
+
+class TestResponse(requests.Response):
+    """ Class used to wrap requests.Response and provide some
+        convenience to initialize with a dict """
+
+    def __init__(self, data):
+        self._text = None
+        super(TestResponse, self)
+        if isinstance(data, dict):
+            self.status_code = data.get('status_code', None)
+            self.headers = data.get('headers', None)
+            # Fake the text attribute to streamline Response creation
+            self._text = data.get('text', None)
+        else:
+            self.status_code = data
+
+    def __eq__(self, other):
+        return self.__dict__ == other.__dict__
+
+    @property
+    def text(self):
+        return self._text

=== added directory 'tests/v1/contrib'
=== added file 'tests/v1/contrib/__init__.py'
=== added file 'tests/v1/contrib/test_list_extensions.py'
--- tests/v1/contrib/test_list_extensions.py	1970-01-01 00:00:00 +0000
+++ tests/v1/contrib/test_list_extensions.py	2013-01-10 22:15:27 +0000
@@ -0,0 +1,21 @@
+from cinderclient import extension
+from cinderclient.v1.contrib import list_extensions
+
+from tests import utils
+from tests.v1 import fakes
+
+
+extensions = [
+    extension.Extension(list_extensions.__name__.split(".")[-1],
+                        list_extensions),
+]
+cs = fakes.FakeClient(extensions=extensions)
+
+
+class ListExtensionsTests(utils.TestCase):
+    def test_list_extensions(self):
+        all_exts = cs.list_extensions.show_all()
+        cs.assert_called('GET', '/extensions')
+        self.assertTrue(len(all_exts) > 0)
+        for r in all_exts:
+            self.assertTrue(len(r.summary) > 0)

=== modified file 'tests/v1/fakes.py'
--- tests/v1/fakes.py	2012-10-01 12:05:26 +0000
+++ tests/v1/fakes.py	2013-01-10 22:15:27 +0000
@@ -13,12 +13,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import httplib2
 import urlparse
 
 from cinderclient import client as base_client
 from cinderclient.v1 import client
 from tests import fakes
+import tests.utils as utils
+
+
+def _stub_volume(**kwargs):
+    volume = {
+        'id': '1234',
+        'display_name': None,
+        'display_description': None,
+        "attachments": [],
+        "bootable": "false",
+        "availability_zone": "cinder",
+        "created_at": "2012-08-27T00:00:00.000000",
+        "display_description": None,
+        "display_name": None,
+        "id": '00000000-0000-0000-0000-000000000000',
+        "metadata": {},
+        "size": 1,
+        "snapshot_id": None,
+        "status": "available",
+        "volume_type": "None",
+    }
+    volume.update(kwargs)
+    return volume
 
 
 def _stub_snapshot(**kwargs):
@@ -39,7 +61,8 @@
 
     def __init__(self, *args, **kwargs):
         client.Client.__init__(self, 'username', 'password',
-                               'project_id', 'auth_url')
+                               'project_id', 'auth_url',
+                               extensions=kwargs.get('extensions'))
         self.client = FakeHTTPClient(**kwargs)
 
 
@@ -74,28 +97,47 @@
 
         # Note the call
         self.callstack.append((method, url, kwargs.get('body', None)))
+        status, headers, body = getattr(self, callback)(**kwargs)
+        r = utils.TestResponse({
+            "status_code": status,
+            "text": body,
+            "headers": headers,
+        })
+        return r, body
 
-        status, body = getattr(self, callback)(**kwargs)
         if hasattr(status, 'items'):
-            return httplib2.Response(status), body
+            return utils.TestResponse(status), body
         else:
-            return httplib2.Response({"status": status}), body
+            return utils.TestResponse({"status": status}), body
 
     #
     # Snapshots
     #
 
     def get_snapshots_detail(self, **kw):
-        return (200, {'snapshots': [
+        return (200, {}, {'snapshots': [
             _stub_snapshot(),
         ]})
 
-    #
-    # volumes
-    #
+    def get_snapshots_1234(self, **kw):
+        return (200, {}, {'snapshot': _stub_snapshot(id='1234')})
+
+    def put_snapshots_1234(self, **kw):
+        snapshot = _stub_snapshot(id='1234')
+        snapshot.update(kw['body']['snapshot'])
+        return (200, {}, {'snapshot': snapshot})
+
+    #
+    # Volumes
+    #
+
+    def put_volumes_1234(self, **kw):
+        volume = _stub_volume(id='1234')
+        volume.update(kw['body']['volume'])
+        return (200, {}, {'volume': volume})
 
     def get_volumes(self, **kw):
-        return (200, {"volumes": [
+        return (200, {}, {"volumes": [
             {'id': 1234, 'name': 'sample-volume'},
             {'id': 5678, 'name': 'sample-volume2'}
         ]})
@@ -103,15 +145,15 @@
     # TODO(jdg): This will need to change
     # at the very least it's not complete
     def get_volumes_detail(self, **kw):
-        return (200, {"volumes": [
+        return (200, {}, {"volumes": [
             {'id': 1234,
              'name': 'sample-volume',
              'attachments': [{'server_id': 1234}]},
         ]})
 
     def get_volumes_1234(self, **kw):
-        r = {'volume': self.get_volumes_detail()[1]['volumes'][0]}
-        return (200, r)
+        r = {'volume': self.get_volumes_detail()[2]['volumes'][0]}
+        return (200, {}, r)
 
     def post_volumes_1234_action(self, body, **kw):
         _body = None
@@ -128,7 +170,7 @@
             assert body[action] is None
         elif action == 'os-initialize_connection':
             assert body[action].keys() == ['connector']
-            return (202, {'connection_info': 'foos'})
+            return (202, {}, {'connection_info': 'foos'})
         elif action == 'os-terminate_connection':
             assert body[action].keys() == ['connector']
         elif action == 'os-begin_detaching':
@@ -137,59 +179,132 @@
             assert body[action] is None
         else:
             raise AssertionError("Unexpected server action: %s" % action)
-        return (resp, _body)
+        return (resp, {}, _body)
 
     def post_volumes(self, **kw):
-        return (202, {'volume': {}})
+        return (202, {}, {'volume': {}})
 
     def delete_volumes_1234(self, **kw):
-        return (202, None)
+        return (202, {}, None)
 
     #
     # Quotas
     #
 
     def get_os_quota_sets_test(self, **kw):
-        return (200, {'quota_set': {
-                      'tenant_id': 'test',
-                      'metadata_items': [],
-                      'volumes': 1,
-                      'gigabytes': 1}})
+        return (200, {}, {'quota_set': {
+                          'tenant_id': 'test',
+                          'metadata_items': [],
+                          'volumes': 1,
+                          'gigabytes': 1}})
 
     def get_os_quota_sets_test_defaults(self):
-        return (200, {'quota_set': {
-                      'tenant_id': 'test',
-                      'metadata_items': [],
-                      'volumes': 1,
-                      'gigabytes': 1}})
+        return (200, {}, {'quota_set': {
+                          'tenant_id': 'test',
+                          'metadata_items': [],
+                          'volumes': 1,
+                          'gigabytes': 1}})
 
     def put_os_quota_sets_test(self, body, **kw):
         assert body.keys() == ['quota_set']
         fakes.assert_has_keys(body['quota_set'],
                               required=['tenant_id'])
-        return (200, {'quota_set': {
-                      'tenant_id': 'test',
-                      'metadata_items': [],
-                      'volumes': 2,
-                      'gigabytes': 1}})
+        return (200, {}, {'quota_set': {
+                          'tenant_id': 'test',
+                          'metadata_items': [],
+                          'volumes': 2,
+                          'gigabytes': 1}})
 
     #
     # Quota Classes
     #
 
     def get_os_quota_class_sets_test(self, **kw):
-        return (200, {'quota_class_set': {
-                      'class_name': 'test',
-                      'metadata_items': [],
-                      'volumes': 1,
-                      'gigabytes': 1}})
+        return (200, {}, {'quota_class_set': {
+                          'class_name': 'test',
+                          'metadata_items': [],
+                          'volumes': 1,
+                          'gigabytes': 1}})
 
     def put_os_quota_class_sets_test(self, body, **kw):
         assert body.keys() == ['quota_class_set']
         fakes.assert_has_keys(body['quota_class_set'],
                               required=['class_name'])
-        return (200, {'quota_class_set': {
-                      'class_name': 'test',
-                      'metadata_items': [],
-                      'volumes': 2,
-                      'gigabytes': 1}})
+        return (200, {}, {'quota_class_set': {
+                          'class_name': 'test',
+                          'metadata_items': [],
+                          'volumes': 2,
+                          'gigabytes': 1}})
+
+    #
+    # VolumeTypes
+    #
+    def get_types(self, **kw):
+        return (200, {}, {
+            'volume_types': [{'id': 1,
+                              'name': 'test-type-1',
+                              'extra_specs':{}},
+                             {'id': 2,
+                              'name': 'test-type-2',
+                              'extra_specs':{}}]})
+
+    def get_types_1(self, **kw):
+        return (200, {}, {'volume_type': {'id': 1,
+                          'name': 'test-type-1',
+                          'extra_specs': {}}})
+
+    def post_types(self, body, **kw):
+        return (202, {}, {'volume_type': {'id': 3,
+                          'name': 'test-type-3',
+                          'extra_specs': {}}})
+
+    def post_types_1_extra_specs(self, body, **kw):
+        assert body.keys() == ['extra_specs']
+        return (200, {}, {'extra_specs': {'k': 'v'}})
+
+    def delete_types_1_extra_specs_k(self, **kw):
+        return(204, {}, None)
+
+    def delete_types_1(self, **kw):
+        return (202, {}, None)
+
+    #
+    # Set/Unset metadata
+    #
+    def delete_volumes_1234_metadata_test_key(self, **kw):
+        return (204, {}, None)
+
+    def delete_volumes_1234_metadata_key1(self, **kw):
+        return (204, {}, None)
+
+    def delete_volumes_1234_metadata_key2(self, **kw):
+        return (204, {}, None)
+
+    def post_volumes_1234_metadata(self, **kw):
+        return (204, {}, {'metadata': {'test_key': 'test_value'}})
+
+    #
+    # List all extensions
+    #
+    def get_extensions(self, **kw):
+        exts = [
+            {
+                "alias": "FAKE-1",
+                "description": "Fake extension number 1",
+                "links": [],
+                "name": "Fake1",
+                "namespace": ("http://docs.openstack.org/"
+                              "/ext/fake1/api/v1.1"),
+                "updated": "2011-06-09T00:00:00+00:00"
+            },
+            {
+                "alias": "FAKE-2",
+                "description": "Fake extension number 2",
+                "links": [],
+                "name": "Fake2",
+                "namespace": ("http://docs.openstack.org/"
+                              "/ext/fake1/api/v1.1"),
+                "updated": "2011-06-09T00:00:00+00:00"
+            },
+        ]
+        return (200, {}, {"extensions": exts, })

=== modified file 'tests/v1/test_auth.py'
--- tests/v1/test_auth.py	2012-10-01 12:05:26 +0000
+++ tests/v1/test_auth.py	2013-01-10 22:15:27 +0000
@@ -1,20 +1,13 @@
-import httplib2
 import json
 import mock
 
+import requests
+
 from cinderclient.v1 import client
 from cinderclient import exceptions
 from tests import utils
 
 
-def to_http_response(resp_dict):
-    """Converts dict of response attributes to httplib response."""
-    resp = httplib2.Response(resp_dict)
-    for k, v in resp_dict['headers'].items():
-        resp[k] = v
-    return resp
-
-
 class AuthenticateAgainstKeystoneTests(utils.TestCase):
     def test_authenticate_success(self):
         cs = client.Client("username", "password", "project_id",
@@ -40,14 +33,14 @@
                 ],
             },
         }
-        auth_response = httplib2.Response({
-            "status": 200,
-            "body": json.dumps(resp), })
-
-        mock_request = mock.Mock(return_value=(auth_response,
-                                               json.dumps(resp)))
-
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        auth_response = utils.TestResponse({
+            "status_code": 200,
+            "text": json.dumps(resp),
+        })
+
+        mock_request = mock.Mock(return_value=(auth_response))
+
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             cs.client.authenticate()
             headers = {
@@ -66,9 +59,13 @@
             }
 
             token_url = cs.client.auth_url + "/tokens"
-            mock_request.assert_called_with(token_url, "POST",
-                                            headers=headers,
-                                            body=json.dumps(body))
+            mock_request.assert_called_with(
+                "POST",
+                token_url,
+                headers=headers,
+                data=json.dumps(body),
+                allow_redirects=True,
+                **self.TEST_REQUEST_BASE)
 
             endpoints = resp["access"]["serviceCatalog"][0]['endpoints']
             public_url = endpoints[0]["publicURL"].rstrip('/')
@@ -108,14 +105,14 @@
                 ],
             },
         }
-        auth_response = httplib2.Response({
-            "status": 200,
-            "body": json.dumps(resp), })
-
-        mock_request = mock.Mock(return_value=(auth_response,
-                                               json.dumps(resp)))
-
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        auth_response = utils.TestResponse({
+            "status_code": 200,
+            "text": json.dumps(resp),
+        })
+
+        mock_request = mock.Mock(return_value=(auth_response))
+
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             cs.client.authenticate()
             headers = {
@@ -134,9 +131,13 @@
             }
 
             token_url = cs.client.auth_url + "/tokens"
-            mock_request.assert_called_with(token_url, "POST",
-                                            headers=headers,
-                                            body=json.dumps(body))
+            mock_request.assert_called_with(
+                "POST",
+                token_url,
+                headers=headers,
+                data=json.dumps(body),
+                allow_redirects=True,
+                **self.TEST_REQUEST_BASE)
 
             endpoints = resp["access"]["serviceCatalog"][0]['endpoints']
             public_url = endpoints[0]["publicURL"].rstrip('/')
@@ -152,14 +153,14 @@
         cs = client.Client("username", "password", "project_id",
                            "auth_url/v2.0")
         resp = {"unauthorized": {"message": "Unauthorized", "code": "401"}}
-        auth_response = httplib2.Response({
-            "status": 401,
-            "body": json.dumps(resp), })
-
-        mock_request = mock.Mock(return_value=(auth_response,
-                                               json.dumps(resp)))
-
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        auth_response = utils.TestResponse({
+            "status_code": 401,
+            "text": json.dumps(resp),
+        })
+
+        mock_request = mock.Mock(return_value=(auth_response))
+
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             self.assertRaises(exceptions.Unauthorized, cs.client.authenticate)
 
@@ -192,29 +193,28 @@
         correct_response = json.dumps(dict_correct_response)
         dict_responses = [
             {"headers": {'location':'http://127.0.0.1:5001'},
-             "status": 305,
-             "body": "Use proxy"},
+             "status_code": 305,
+             "text": "Use proxy"},
             # Configured on admin port, cinder redirects to v2.0 port.
             # When trying to connect on it, keystone auth succeed by v1.0
             # protocol (through headers) but tokens are being returned in
             # body (looks like keystone bug). Leaved for compatibility.
             {"headers": {},
-             "status": 200,
-             "body": correct_response},
+             "status_code": 200,
+             "text": correct_response},
             {"headers": {},
-             "status": 200,
-             "body": correct_response}
+             "status_code": 200,
+             "text": correct_response}
         ]
 
-        responses = [(to_http_response(resp), resp['body'])
-                     for resp in dict_responses]
+        responses = [(utils.TestResponse(resp)) for resp in dict_responses]
 
         def side_effect(*args, **kwargs):
             return responses.pop(0)
 
         mock_request = mock.Mock(side_effect=side_effect)
 
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             cs.client.authenticate()
             headers = {
@@ -233,9 +233,13 @@
             }
 
             token_url = cs.client.auth_url + "/tokens"
-            mock_request.assert_called_with(token_url, "POST",
-                                            headers=headers,
-                                            body=json.dumps(body))
+            mock_request.assert_called_with(
+                "POST",
+                token_url,
+                headers=headers,
+                data=json.dumps(body),
+                allow_redirects=True,
+                **self.TEST_REQUEST_BASE)
 
             resp = dict_correct_response
             endpoints = resp["access"]["serviceCatalog"][0]['endpoints']
@@ -282,16 +286,14 @@
                 ],
             },
         }
-        auth_response = httplib2.Response(
-            {
-                "status": 200,
-                "body": json.dumps(resp),
-            })
-
-        mock_request = mock.Mock(return_value=(auth_response,
-                                               json.dumps(resp)))
-
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        auth_response = utils.TestResponse({
+            "status_code": 200,
+            "text": json.dumps(resp),
+        })
+
+        mock_request = mock.Mock(return_value=(auth_response))
+
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             self.assertRaises(exceptions.AmbiguousEndpoints,
                               cs.client.authenticate)
@@ -302,15 +304,17 @@
 class AuthenticationTests(utils.TestCase):
     def test_authenticate_success(self):
         cs = client.Client("username", "password", "project_id", "auth_url")
-        management_url = 'https://servers.api.rackspacecloud.com/v1.1/443470'
-        auth_response = httplib2.Response({
-            'status': 204,
-            'x-server-management-url': management_url,
-            'x-auth-token': '1b751d74-de0c-46ae-84f0-915744b582d1',
+        management_url = 'https://localhost/v1.1/443470'
+        auth_response = utils.TestResponse({
+            'status_code': 204,
+            'headers': {
+                'x-server-management-url': management_url,
+                'x-auth-token': '1b751d74-de0c-46ae-84f0-915744b582d1',
+            },
         })
-        mock_request = mock.Mock(return_value=(auth_response, None))
+        mock_request = mock.Mock(return_value=(auth_response))
 
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             cs.client.authenticate()
             headers = {
@@ -320,21 +324,25 @@
                 'X-Auth-Project-Id': 'project_id',
                 'User-Agent': cs.client.USER_AGENT
             }
-            mock_request.assert_called_with(cs.client.auth_url, 'GET',
-                                            headers=headers)
+            mock_request.assert_called_with(
+                "GET",
+                cs.client.auth_url,
+                headers=headers,
+                **self.TEST_REQUEST_BASE)
+
             self.assertEqual(cs.client.management_url,
-                             auth_response['x-server-management-url'])
+                             auth_response.headers['x-server-management-url'])
             self.assertEqual(cs.client.auth_token,
-                             auth_response['x-auth-token'])
+                             auth_response.headers['x-auth-token'])
 
         test_auth_call()
 
     def test_authenticate_failure(self):
         cs = client.Client("username", "password", "project_id", "auth_url")
-        auth_response = httplib2.Response({'status': 401})
-        mock_request = mock.Mock(return_value=(auth_response, None))
+        auth_response = utils.TestResponse({"status_code": 401})
+        mock_request = mock.Mock(return_value=(auth_response))
 
-        @mock.patch.object(httplib2.Http, "request", mock_request)
+        @mock.patch.object(requests, "request", mock_request)
         def test_auth_call():
             self.assertRaises(exceptions.Unauthorized, cs.client.authenticate)
 

=== modified file 'tests/v1/test_shell.py'
--- tests/v1/test_shell.py	2012-10-01 12:05:26 +0000
+++ tests/v1/test_shell.py	2013-01-10 22:15:27 +0000
@@ -17,6 +17,8 @@
 
 import os
 
+import fixtures
+
 from cinderclient import client
 from cinderclient import shell
 from tests.v1 import fakes
@@ -25,17 +27,21 @@
 
 class ShellTest(utils.TestCase):
 
+    FAKE_ENV = {
+        'CINDER_USERNAME': 'username',
+        'CINDER_PASSWORD': 'password',
+        'CINDER_PROJECT_ID': 'project_id',
+        'OS_COMPUTE_API_VERSION': '1.1',
+        'CINDER_URL': 'http://no.where',
+    }
+
     # Patch os.environ to avoid required auth info.
     def setUp(self):
         """Run before each test."""
-        self.old_environment = os.environ.copy()
-        os.environ = {
-            'CINDER_USERNAME': 'username',
-            'CINDER_PASSWORD': 'password',
-            'CINDER_PROJECT_ID': 'project_id',
-            'OS_COMPUTE_API_VERSION': '1.1',
-            'CINDER_URL': 'http://no.where',
-        }
+        super(ShellTest, self).setUp()
+        for var in self.FAKE_ENV:
+            self.useFixture(fixtures.EnvironmentVariable(var,
+                                                         self.FAKE_ENV[var]))
 
         self.shell = shell.OpenStackCinderShell()
 
@@ -44,7 +50,6 @@
         client.get_client_class = lambda *_: fakes.FakeClient
 
     def tearDown(self):
-        os.environ = self.old_environment
         # For some method like test_image_meta_bad_action we are
         # testing a SystemExit to be thrown and object self.shell has
         # no time to get instantatiated which is OK in this case, so
@@ -54,6 +59,7 @@
 
         #HACK(bcwaldon): replace this when we start using stubs
         client.get_client_class = self.old_get_client_class
+        super(ShellTest, self).tearDown()
 
     def run_command(self, cmd):
         self.shell.main(cmd.split())
@@ -87,6 +93,7 @@
 
     def test_delete(self):
         self.run_command('delete 1234')
+        self.assert_called('DELETE', '/volumes/1234')
 
     def test_snapshot_list_filter_volume_id(self):
         self.run_command('snapshot-list --volume-id=1234')
@@ -96,3 +103,61 @@
         self.run_command('snapshot-list --status=available --volume-id=1234')
         self.assert_called('GET', '/snapshots/detail?'
                            'status=available&volume_id=1234')
+
+    def test_rename(self):
+        # basic rename with positional agruments
+        self.run_command('rename 1234 new-name')
+        expected = {'volume': {'display_name': 'new-name'}}
+        self.assert_called('PUT', '/volumes/1234', body=expected)
+        # change description only
+        self.run_command('rename 1234 --display-description=new-description')
+        expected = {'volume': {'display_description': 'new-description'}}
+        self.assert_called('PUT', '/volumes/1234', body=expected)
+        # rename and change description
+        self.run_command('rename 1234 new-name '
+                         '--display-description=new-description')
+        expected = {'volume': {
+            'display_name': 'new-name',
+            'display_description': 'new-description',
+        }}
+        self.assert_called('PUT', '/volumes/1234', body=expected)
+        # noop, the only all will be the lookup
+        self.run_command('rename 1234')
+        self.assert_called('GET', '/volumes/1234')
+
+    def test_rename_snapshot(self):
+        # basic rename with positional agruments
+        self.run_command('snapshot-rename 1234 new-name')
+        expected = {'snapshot': {'display_name': 'new-name'}}
+        self.assert_called('PUT', '/snapshots/1234', body=expected)
+        # change description only
+        self.run_command('snapshot-rename 1234 '
+                         '--display-description=new-description')
+        expected = {'snapshot': {'display_description': 'new-description'}}
+        self.assert_called('PUT', '/snapshots/1234', body=expected)
+        # snapshot-rename and change description
+        self.run_command('snapshot-rename 1234 new-name '
+                         '--display-description=new-description')
+        expected = {'snapshot': {
+            'display_name': 'new-name',
+            'display_description': 'new-description',
+        }}
+        self.assert_called('PUT', '/snapshots/1234', body=expected)
+        # noop, the only all will be the lookup
+        self.run_command('snapshot-rename 1234')
+        self.assert_called('GET', '/snapshots/1234')
+
+    def test_set_metadata_set(self):
+        self.run_command('metadata 1234 set key1=val1 key2=val2')
+        self.assert_called('POST', '/volumes/1234/metadata',
+                           {'metadata': {'key1': 'val1', 'key2': 'val2'}})
+
+    def test_set_metadata_delete_dict(self):
+        self.run_command('metadata 1234 unset key1=val1 key2=val2')
+        self.assert_called('DELETE', '/volumes/1234/metadata/key1')
+        self.assert_called('DELETE', '/volumes/1234/metadata/key2', pos=-2)
+
+    def test_set_metadata_delete_keys(self):
+        self.run_command('metadata 1234 unset key1 key2')
+        self.assert_called('DELETE', '/volumes/1234/metadata/key1')
+        self.assert_called('DELETE', '/volumes/1234/metadata/key2', pos=-2)

=== added file 'tests/v1/test_types.py'
--- tests/v1/test_types.py	1970-01-01 00:00:00 +0000
+++ tests/v1/test_types.py	2013-01-10 22:15:27 +0000
@@ -0,0 +1,35 @@
+from cinderclient import exceptions
+from cinderclient.v1 import volume_types
+from tests import utils
+from tests.v1 import fakes
+
+cs = fakes.FakeClient()
+
+
+class TypesTest(utils.TestCase):
+    def test_list_types(self):
+        tl = cs.volume_types.list()
+        cs.assert_called('GET', '/types')
+        for t in tl:
+            self.assertTrue(isinstance(t, volume_types.VolumeType))
+
+    def test_create(self):
+        t = cs.volume_types.create('test-type-3')
+        cs.assert_called('POST', '/types')
+        self.assertTrue(isinstance(t, volume_types.VolumeType))
+
+    def test_set_key(self):
+        t = cs.volume_types.get(1)
+        t.set_keys({'k': 'v'})
+        cs.assert_called('POST',
+                         '/types/1/extra_specs',
+                         {'extra_specs': {'k': 'v'}})
+
+    def test_unsset_keys(self):
+        t = cs.volume_types.get(1)
+        t.unset_keys(['k'])
+        cs.assert_called('DELETE', '/types/1/extra_specs/k')
+
+    def test_delete(self):
+        cs.volume_types.delete(1)
+        cs.assert_called('DELETE', '/types/1')

=== modified file 'tests/v1/test_volumes.py'
--- tests/v1/test_volumes.py	2012-10-01 12:05:26 +0000
+++ tests/v1/test_volumes.py	2013-01-10 22:15:27 +0000
@@ -1,4 +1,3 @@
-from cinderclient.v1 import volumes
 from tests import utils
 from tests.v1 import fakes
 
@@ -18,7 +17,7 @@
         cs.assert_called('DELETE', '/volumes/1234')
 
     def test_create_keypair(self):
-        kp = cs.volumes.create(1)
+        cs.volumes.create(1)
         cs.assert_called('POST', '/volumes')
 
     def test_attach(self):
@@ -60,3 +59,13 @@
         v = cs.volumes.get('1234')
         cs.volumes.terminate_connection(v, {})
         cs.assert_called('POST', '/volumes/1234/action')
+
+    def test_set_metadata(self):
+        cs.volumes.set_metadata(1234, {'k1': 'v1'})
+        cs.assert_called('POST', '/volumes/1234/metadata',
+                         {'metadata': {'k1': 'v1'}})
+
+    def test_delete_metadata(self):
+        keys = ['key1']
+        cs.volumes.delete_metadata(1234, keys)
+        cs.assert_called('DELETE', '/volumes/1234/metadata/key1')

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2012-06-27 13:32:14 +0000
+++ tools/pip-requires	2013-01-10 22:15:27 +0000
@@ -1,4 +1,4 @@
 argparse
-httplib2
 prettytable
+requests<1.0
 simplejson

=== modified file 'tools/test-requires'
--- tools/test-requires	2012-09-07 11:35:32 +0000
+++ tools/test-requires	2013-01-10 22:15:27 +0000
@@ -1,10 +1,11 @@
+distribute>=0.6.24
 
-distribute>=0.6.24
+fixtures
 mock
 nose
+nosehtmloutput
 nosexcover
 openstack.nose_plugin
-nosehtmloutput
-pep8==1.2
+pep8==1.3.3
 sphinx>=1.1.2
-unittest2
+testtools>=0.9.22