Merge lp:~zulcss/ubuntu/precise/python-novaclient/new into lp:~ubuntu-cloud-archive/ubuntu/precise/python-novaclient/trunk

[Chuck Short]

new release

[James Page (james-page)]

Minor nit:

+python-novaclient (1:2.9.0-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+ * New upstream snapshot for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <email address hidden> Fri, 28 Sep 2012 11:57:15 -0500
+

Its not a snapshot - its a new release.

Other than that LGTM.

review: Approve

[James Page (james-page)]

Ignore that - I reviewed the existing branch.

[James Page (james-page)]

OK - reviewed the correct one this time - precise-grizzly target looks just fine.

review: Approve

=== modified file '.mailmap'
--- .mailmap	2012-08-16 12:41:00 +0000
+++ .mailmap	2012-11-30 14:02:33 +0000
@@ -6,7 +6,8 @@
 <[e-mail]> <[e-mail]>
 Johannes Erdfelt <[e-mail]> jerdfelt <[e-mail]>
 <[e-mail]> <[e-mail]>
-<[e-mail]> <jkearney@nova.(none)>
+<[e-mail]> <[e-mail]>
+<[e-mail]> <jkearney@nova.(none)>
 <[e-mail]> <[e-mail]>
 <[e-mail]> <[e-mail]>
 Andy Smith <[e-mail]> termie <[e-mail]>

=== modified file 'AUTHORS'
--- AUTHORS	2012-09-27 08:59:05 +0000
+++ AUTHORS	2012-11-30 14:02:33 +0000
@@ -18,6 +18,7 @@
 Chris Behrens <[e-mail]>
 Christian Berendt <[e-mail]>
 Christopher MacGown <[e-mail]>
+Chris Yeoh <[e-mail]>
 Chuck <[e-mail]>
 Clark Boylan <[e-mail]>
 Cole Robinson <[e-mail]>
@@ -26,6 +27,7 @@
 Dave Walker (Daviey) <[e-mail]>
 Dean Troyer <[e-mail]>
 Dominik Heidler <[e-mail]>
+Doug Hellmann <[e-mail]>
 Ed Leafe <[e-mail]>
 Édouard Thuleau <[e-mail]>
 Eldar Nugaev <[e-mail]>
@@ -37,6 +39,7 @@
 Ghe Rivero <[e-mail]>
 Hengqing Hu <[e-mail]>
 Ilya Alekseyev <[e-mail]>
+ivan-zhu <[e-mail]>
 jakedahn <[e-mail]>
 Jake Dahn <[e-mail]>
 James E. Blair <[e-mail]>
@@ -50,8 +53,10 @@
 Johannes Erdfelt <[e-mail]>
 John Garbutt <[e-mail]>
 John Tran <[e-mail]>
-Josh Kearney <[e-mail]>
+Josh Kearney <[e-mail]>
+Joshua Harlow <[e-mail]>
 Julien Danjou <[e-mail]>
+Julie Pichon <[e-mail]>
 Kevin L. Mitchell <[e-mail]>
 Kiall Mac Innes <[e-mail]>
 Kirill Shileev <[e-mail]>
@@ -64,31 +69,43 @@
 masumotok <[e-mail]>
 Matt Dietz <[e-mail]>
 Matt Stephenson <[e-mail]>
+melwitt <[e-mail]>
 Michael Basnight <[e-mail]>
 Monty Taylor <[e-mail]>
 Nachi Ueno <[e-mail]>
 Nicholas Mistry <[e-mail]>
+Nick Shobe <[e-mail]>
+Nikola Dipanov <[e-mail]>
 Nikolay Sokolov <[e-mail]>
 Ollie Leahy <[e-mail]>
 Pádraig Brady <[e-mail]>
 Paul Voccio <[e-mail]>
+Paul Voccio <[e-mail]>
 Pavel Shkitin <[e-mail]>
 Peng Yong <[e-mail]>
 Rick Harris <[e-mail]>
 Robie Basak <[e-mail]>
 Russell Bryant <[e-mail]>
+Russell Cloran <[e-mail]>
 Sandy Walsh <[e-mail]>
 SandyWalsh <[e-mail]>
 Sascha Peilicke <[e-mail]>
+sathish-nagappan <[e-mail]>
+Sathish Nagappan <[e-mail]>
 Scott Moser <[e-mail]>
+Stanislaw Pitucha <[e-mail]>
+Stef T <[e-mail]>
 Sulochan Acharya <[e-mail]>
 Thierry Carrez <[e-mail]>
 TianTian Gao <[e-mail]>
 Trey Morris <[e-mail]>
 unicell <[e-mail]>
+Unmesh Gurjar <[e-mail]>
 Unmesh Gurjar <[e-mail]>
+Vincent Untz <[e-mail]>
 Vishvananda Ishaya <[e-mail]>
 William Wolf <[e-mail]>
+Yaguang Tang <[e-mail]>
 Your Name <[e-mail]>
 Yunhong, Jiang <[e-mail]>
 Yuriy Taraday <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-27 08:59:05 +0000
+++ ChangeLog	2012-11-30 14:02:33 +0000
@@ -1,3 +1,824 @@
+commit 18deaf47918e5baa655fabb9776d294571363608
+Merge: fef3af7 494040d
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 29 19:11:11 2012 +0000
+
+    Merge "Remove unnecessary casts in flavor create."
+
+commit fef3af70725be74763d4ad95c624407dfde25b2a
+Merge: 926b334 27d7ad9
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 29 19:10:38 2012 +0000
+
+    Merge "Validate that rxtx_factor is a float."
+
+commit 926b334613169d59f91d522218d3418a69952d98
+Merge: c4f0f50 4f6419b
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 29 19:10:19 2012 +0000
+
+    Merge "Adds nova client support for nova-manage vpn command"
+
+commit c4f0f50a2a8f043f66cb010fbcf1e2ec5b7dcd23
+Merge: b2338b9 3839d28
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 29 18:51:08 2012 +0000
+
+    Merge "Adds nova client support for nova-manage fixed command"
+
+commit b2338b9a33547f600233b21bc64e74985327ce70
+Merge: b9d60c1 ff69e4d
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 29 18:50:20 2012 +0000
+
+    Merge "Implement fping calls in nova client"
+
+commit 494040d7fe36ddd00c8813a6e894e53b1abf31be
+Author: Dan Prince <[e-mail]>
+Date:   Tue Nov 27 11:05:53 2012 -0500
+
+    Remove unnecessary casts in flavor create.
+    
+    We already cast and validate these variables above... no
+    need to cast them again.
+    
+    Change-Id: I87b967925ae77c70eb07a42f3ae050703d44a427
+
+ novaclient/v1_1/flavors.py |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 27d7ad9d8632bdc67e25757a42a91109e393fbf9
+Author: Dan Prince <[e-mail]>
+Date:   Tue Nov 27 10:59:43 2012 -0500
+
+    Validate that rxtx_factor is a float.
+    
+    Nova stores rxtx_factor as a float internally and as such
+    novaclient should validate that a float is specified
+    when creating a flavor.
+    
+    Fixes LP Bug #1083651.
+    
+    Change-Id: I75f9440d3fe2a0e72ea592f2259640623400ae73
+
+ novaclient/v1_1/flavors.py |    8 ++++----
+ novaclient/v1_1/shell.py   |    2 +-
+ tests/v1_1/test_flavors.py |   16 ++++++++--------
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 4f6419b5553e853f5720084ba01fc0b4cc1f6220
+Author: Chris Yeoh <[e-mail]>
+Date:   Mon Nov 26 14:21:35 2012 +1030
+
+    Adds nova client support for nova-manage vpn command
+    
+    Adds "nova cloudpipe-configure" command
+    Adds shell tests for cloudpipe-list and cloudpipe-create commands which
+    already exist
+    
+    This patch depends on https://review.openstack.org/#/c/15854/
+    
+    Change-Id: I784f5bf0f25a2d8cae4b7c2c6ccf345842ffe352
+    Implements: blueprint apis-for-nova-manage
+
+ novaclient/v1_1/cloudpipe.py |   14 ++++++++++++++
+ novaclient/v1_1/shell.py     |    7 +++++++
+ tests/v1_1/fakes.py          |    3 +++
+ tests/v1_1/test_cloudpipe.py |    6 ++++++
+ tests/v1_1/test_shell.py     |   15 +++++++++++++++
+ 5 files changed, 45 insertions(+)
+
+commit b9d60c1fd2f887992fc1f6c2246b1f0f11efe1a9
+Author: Joe Gordon <[e-mail]>
+Date:   Mon Nov 26 14:26:53 2012 -0800
+
+    Fix aggregate command help messages.
+    
+    Fixes bug 1083343
+    
+    Change-Id: I315a0629bb33480952f2280b053b8db8cb83a1ea
+
+ novaclient/v1_1/shell.py |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+commit 3839d284da8bb269ca392727f0716ddc2238b880
+Author: Chris Yeoh <[e-mail]>
+Date:   Thu Nov 22 22:43:59 2012 +1030
+
+    Adds nova client support for nova-manage fixed command
+    
+    Adds the following commands:
+    - "fixed-ip-get <ip_addr>" - displays information about the fixed ip ip_addr
+    - "fixed-ip-reserve <ip_addr>" - reserves the fixed ip ip_addr
+    - "fixed-ip-unreserve <ip_addr>" - unreserves the fixed ip ip_addr
+    
+    Change-Id: I6a5c8b9f7ab359adeb57b86240279649cd421801
+    Implements: blueprint apis-for-nova-manage
+
+ novaclient/v1_1/client.py    |    2 ++
+ novaclient/v1_1/fixed_ips.py |   58 ++++++++++++++++++++++++++++++++++++++++++
+ novaclient/v1_1/shell.py     |   19 ++++++++++++++
+ tests/v1_1/fakes.py          |   13 ++++++++++
+ tests/v1_1/test_fixed_ips.py |   43 +++++++++++++++++++++++++++++++
+ tests/v1_1/test_shell.py     |   14 ++++++++++
+ 6 files changed, 149 insertions(+)
+
+commit ff69e4d3830f463afa48ca432600224f29a2c238
+Author: Alessio Ababilov <[e-mail]>
+Date:   Mon Nov 19 11:33:50 2012 +0200
+
+    Implement fping calls in nova client
+    
+    Implements blueprint novaclient-fping
+    
+    Provide fping API calls in nova client as well as unit tests. API is
+    accessed by `fping` field of nova client.
+    Methods:
+    * list(all_tenants=False|True, include=[VM ids], exclude=[VM ids]) -
+      perform fping for all VMs in current project (or all projects if
+      all_tenants==True)
+    * get(server object or id) - perform fping for single instance
+    
+    Change-Id: Ic3eda142781d1a14f2cfc83626672a579fc93a7d
+
+ novaclient/v1_1/client.py |    2 ++
+ novaclient/v1_1/fping.py  |   66 +++++++++++++++++++++++++++++++++++++++++++++
+ tests/v1_1/fakes.py       |   29 ++++++++++++++++++++
+ tests/v1_1/test_fping.py  |   41 ++++++++++++++++++++++++++++
+ 4 files changed, 138 insertions(+)
+
+commit dc6285c810b696949597dcde6717bb3f3a6c47c9
+Author: Julie Pichon <[e-mail]>
+Date:   Wed Nov 21 18:16:17 2012 +0000
+
+    Expand help message for 'migrate' to explain how the new host is selected
+    
+    Fixes bug 1078247
+    
+    Change-Id: Iedfd6fc957fd1c2e53f7685b02bd33e16d9342e9
+
+ novaclient/v1_1/shell.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 572c8bbf8020c2bcd3d6e529574ee8866ba3cbea
+Merge: 0173a3c 3fd0c77
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:18:08 2012 +0000
+
+    Merge "Boot from volume without image supplied"
+
+commit 0173a3cd7085502ac1b9cd39858e5cc9de16bb02
+Merge: 1558d5d e9b015c
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:18:01 2012 +0000
+
+    Merge "Cleans up the flavor creation code. Fixes bug 1080891."
+
+commit 1558d5d537d89852339a01a18bb8cbb4198bbb52
+Merge: 92de98c 3ea4ba9
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:12:04 2012 +0000
+
+    Merge "Added --extra-opts to the nova ssh command"
+
+commit 92de98c8f68cc22b88dd164ca473eb86dbf1e45a
+Merge: bc141de 5d5df17
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:12:03 2012 +0000
+
+    Merge "fix hypervisor-servers for hypervisors without servers"
+
+commit bc141de141e5e9796f4b1c0891e90cda65d726f5
+Merge: f790ccc aac4fff
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:12:01 2012 +0000
+
+    Merge "Make sure create_image returns result"
+
+commit f790ccc6bc05a60b378bb7555083d8a8a228fb46
+Merge: 89c46e6 c819c2f
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:10:15 2012 +0000
+
+    Merge "make tenant id optional for quota-defaults and quota-show"
+
+commit 89c46e6325f588069e951397fe2522e28d153c36
+Merge: 47355b7 d037172
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 17:09:23 2012 +0000
+
+    Merge "Add nova client support for nova-manage service command"
+
+commit 47355b741b50a63227fb38e6be6b485902efe3e5
+Author: Nikola Dipanov <[e-mail]>
+Date:   Fri Nov 16 10:00:46 2012 +0100
+
+    Improved quota output
+    
+    This patch makes the output of quota show a bit more informative
+    by not setting a simple None to a non-existing quota, but not showing it
+    all together.
+    
+    Kind of fixes bug #1078906
+    and also bug #1078089
+    
+    Change-Id: Ic42837d218a80f37e0c6d56625c9804d076f444c
+
+ novaclient/v1_1/shell.py |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 3fd0c77d07419606a81f257b8876394ec5b374de
+Author: Nikola Dipanov <[e-mail]>
+Date:   Wed Nov 7 18:58:58 2012 +0100
+
+    Boot from volume without image supplied
+    
+    Allow for booting instances from volume without the image parameter
+    supplied. This change is related to the change
+    I530760cfaa5eb0cae590c7383e0840c6b3f896b9
+    in opnestack/nova. It allows for boot to work with no image supplied
+    to accommodate booting from volumes only.
+    
+    It also makes it possible to interpret show servers that were started
+    without images, so from volumes only
+    
+    Change-Id: I5ba9b0f35a5084aa91eca260f46cac83b8b6591e
+
+ novaclient/v1_1/base.py    |    2 +-
+ novaclient/v1_1/shell.py   |   34 ++++++++++++++++++++++------------
+ tests/v1_1/fakes.py        |   39 +++++++++++++++++++++++++++++++++++++++
+ tests/v1_1/test_servers.py |    2 +-
+ tests/v1_1/test_shell.py   |   32 ++++++++++++++++++++++++++++++++
+ 5 files changed, 95 insertions(+), 14 deletions(-)
+
+commit 3ea4ba9fc97b05ad93af8f9aa6f6bc2a638b9a36
+Author: Nick Shobe <[e-mail]>
+Date:   Sat Nov 17 04:26:08 2012 -0600
+
+    Added --extra-opts to the nova ssh command
+    
+    This will allow for remote command execution and advanced ssh options
+    like portforwarding and connection sharing.
+    The goal is to support ssh commands like
+    nova ssh fe55adc9-cb1e-44a4-bd36-6a537b238172 --extra-opts='-NfnMS ~/.ssh/master-fe55adc9-cb1e-44a4-bd36-6a537b238172'
+    and ssh fe55adc9-cb1e-44a4-bd36-6a537b238172 --extra-opts='-t "sudo puppet agent --test"'
+    This will alow easier scripting of the cli... It is not intended
+    however to replace using the nova python api. Therefore I kept it simple.
+    
+    Change-Id: Icce811caf637fc92c6d6374bfb846ea9525a7e05
+
+ novaclient/v1_1/shell.py |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit e9b015c7e14843784debc0d68cfe070c9778f80d
+Author: Gabriel Hurley <[e-mail]>
+Date:   Sat Nov 17 18:18:48 2012 -0800
+
+    Cleans up the flavor creation code. Fixes bug 1080891.
+    
+    Change-Id: Idc76cd01d1537ab87723a05ab8dd81015284e3c8
+
+ novaclient/v1_1/flavors.py |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit aa8d44c551643bb97e039624d602bd4ad07cbe9c
+Author: Paul Voccio <[e-mail]>
+Date:   Fri Nov 16 11:34:12 2012 -0600
+
+    Adding support to filter instances by tenant from the admin api
+    
+    Change-Id: I37a2c5ad7bbe3e005e96416ea974051a82879adc
+
+ novaclient/v1_1/shell.py |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit aac4fff1532cc96302cd1566406c6d3b3fe60e47
+Author: Stanislaw Pitucha <[e-mail]>
+Date:   Fri Nov 9 10:49:02 2012 +0000
+
+    Make sure create_image returns result
+    
+    manager.servers.create_image() returned uuid of the snapshot, but
+    Server.create_image() didn't. Make them work the same.
+    
+    Change-Id: I763197ac8ae542e7ce13569d8ce7e98ec92ccc63
+
+ novaclient/v1_1/servers.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c819c2fb50c63554d70f735a6463c911f2f6d8eb
+Author: Christian Berendt <[e-mail]>
+Date:   Fri Nov 9 10:52:23 2012 +0100
+
+    make tenant id optional for quota-defaults and quota-show
+    
+    When using quota-defaults or quota-show without specifing a tenant
+    the currently used tenant should be used.
+    
+    Change-Id: I1ef71b68673dd4a95cbf8b5a8dc901fb6eb06865
+
+ novaclient/v1_1/client.py |    1 +
+ novaclient/v1_1/shell.py  |   20 ++++++++++++++------
+ tests/v1_1/test_shell.py  |    4 ++--
+ 3 files changed, 17 insertions(+), 8 deletions(-)
+
+commit 5d5df1763d83296464a3c4a9c5c82e9a5057edee
+Author: Christian Berendt <[e-mail]>
+Date:   Thu Nov 8 17:06:24 2012 +0100
+
+    fix hypervisor-servers for hypervisors without servers
+    
+    At the moment hypervisor-servers throws an AttributeError for
+    hypervisors with no assigned instances. This patch checks first
+    if there are assigned instances before looping through them to
+    avoid the exception.
+    
+    fixes bug 1076435
+    
+    Change-Id: I504e3f234fd041325b63295fab77f9ed3f704db0
+
+ novaclient/v1_1/shell.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit aa5622147faa0de137f67c6be45dbdb3e11320f6
+Author: melwitt <[e-mail]>
+Date:   Wed Nov 7 22:58:32 2012 +0000
+
+    discover extensions via entry points
+    
+    Currently, nova client can only discover extensions in two ways:
+    
+    1. Installing the extension in the novaclient/v1_1/contrib/ directory.
+    2. Installing the extension in the top-level python path or modifying
+       the path to be picked up by pkgutils.iter_modules()
+    
+    This patch allows a third, more flexible option of discovering
+    extensions via entry points. This means the extension can be
+    installed anywhere and entry points can be registered with python
+    to be picked up by pkg_resources.iter_entry_points().
+    To register an entry point, simply add the extension module to
+    the setup() call in setup.py like this:
+    
+    setuptools.setup(
+        name='mydistribution',
+        packages=setuptools.find_packages(),
+        entry_points={
+            'novaclient.extension' : [
+                'foo = mydistribution.mynovaclientexts.foo'
+            ]
+        },
+    )
+    
+    Change-Id: Ic1e223a9173546131e742506897f585f4ac65767
+
+ novaclient/shell.py    |   11 ++++++-
+ tests/test_discover.py |   79 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 89 insertions(+), 1 deletion(-)
+
+commit 4ad512b50e0c2190fbd4ef077256faf808496e2b
+Author: Christian Berendt <[e-mail]>
+Date:   Thu Nov 8 21:03:13 2012 +0100
+
+    show help when calling without arguments
+    
+    When calling nova without arguments you'll receive the following
+    output:
+    
+    error: too few arguments
+    Try 'nova help ' for more information.
+    
+    Changing 'and' to 'or' the help is also shown when calling nova
+    without arguments. I think that's the expected behavior.
+    
+    Change-Id: Id14f0292ad00e6e45ad66dd010f449c3abbf3871
+
+ novaclient/shell.py |    2 +-
+ tests/test_shell.py |   18 ++++++------------
+ 2 files changed, 7 insertions(+), 13 deletions(-)
+
+commit d037172b701afd66d1ac187a3c7e4a76130a8f4f
+Author: ivan-zhu <[e-mail]>
+Date:   Thu Nov 8 17:56:18 2012 +0800
+
+    Add nova client support for nova-manage service command
+    
+    Implements the one workitem of blueprint apis-for-nova-manage
+    
+    This add three CLI (service-list/sevice-enable/service-diabel) in
+    nova-client.
+    
+    So we can use:
+    "nova service-list" like "nova-manage service list" with two optional
+    parameters. Show a list of all running services. Filter by host and
+    service name.
+    
+    "nova service-enable hostname servicename" like "nova-manage service
+    enable hostname servicename". It will enable the service specified by
+    hostname and serviename.
+    
+    "nova service-disable hostname servicename" like "nova-manage service
+    diable hostname servicename". It will disable the service specified by
+    hostname and serviename.
+    
+    This patch depends on https://review.openstack.org/#/c/15206/
+    
+    Change-Id: I01d4cee4ef95c1783f6181f8b840244e748387e5
+
+ novaclient/v1_1/client.py   |    2 ++
+ novaclient/v1_1/services.py |   62 +++++++++++++++++++++++++++++++++++++++
+ novaclient/v1_1/shell.py    |   27 +++++++++++++++++
+ tests/v1_1/fakes.py         |   30 +++++++++++++++++++
+ tests/v1_1/test_services.py |   68 +++++++++++++++++++++++++++++++++++++++++++
+ tests/v1_1/test_shell.py    |   26 +++++++++++++++++
+ 6 files changed, 215 insertions(+)
+
+commit a84300f020e79adcaad313aff7f7ee11d9c18d1a
+Merge: 40ef419 33b2830
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 7 22:38:54 2012 +0000
+
+    Merge "Allows deletion of multiple servers through CLI"
+
+commit 40ef4197e982b840f9c3363bc83bf16600f763c5
+Merge: a31d285 51faac4
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 6 17:45:56 2012 +0000
+
+    Merge "Add ability of nova client to display availability zones when listing hosts"
+
+commit a31d285f6e7d5516d69319424db06608050107f6
+Merge: 887f831 e9c16ca
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 6 17:13:56 2012 +0000
+
+    Merge "Updated the help text for nova list command."
+
+commit 887f8314689a71144d4f5c5365d2253e8c662921
+Merge: 0dea78c 8be01b6
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 6 06:48:57 2012 +0000
+
+    Merge "Fixes setup compatibility issue on Windows"
+
+commit e9c16ca33ad035fda38d42ec3f7e9e40e56cbf6b
+Author: Unmesh Gurjar <[e-mail]>
+Date:   Sun Nov 4 23:20:37 2012 -0800
+
+    Updated the help text for nova list command.
+    
+    Few options in the nova list command are admin specific. Updated the help text
+    to specify the admin only options explitcitly.
+    
+    Fixes LP: #1055983
+    
+    Change-Id: Icf8a76e79b9d5399298dacce31b1cc0873f63d71
+
+ novaclient/v1_1/shell.py |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 8be01b650e4669132c0d27481781bdf5688079ec
+Author: Alessandro Pilotti <[e-mail]>
+Date:   Mon Nov 5 17:47:05 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: I9c8cf84ada189d8f27448ecda23f51c021d08818
+
+ novaclient/openstack/common/setup.py |   16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+commit 0dea78c851a7d43df5ffa9c00bbbc09e857560f0
+Author: Jesse Andrews <[e-mail]>
+Date:   Sat Nov 3 16:18:53 2012 -0700
+
+    include projectid in the cache key
+    
+    fixes bug #1074771
+    
+    Change-Id: I0fc1638405c2f4de61255d3efc1b6096ead0742b
+
+ novaclient/client.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7ddc2fdfcdc0bfa6ada3d150a87ab3d930259538
+Author: Nikola Dipanov <[e-mail]>
+Date:   Fri Nov 2 18:06:51 2012 +0100
+
+    Fixes utils.findresource checking for integer
+    
+    Fixes the novaclient.utils.find_resource function to properly handle
+    non integer values and not break with an AttributeError.
+    
+    Adds a test case to test a few more non valid inputs.
+    
+    Fixes bug #1065367
+    
+    Change-Id: Iaa2025f4eb580234f754596c3572e2f87872170e
+
+ novaclient/utils.py |   11 ++++++++---
+ tests/test_utils.py |    9 +++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+commit 33b2830e9c81f87fb37e51eca65f6e98143d1e06
+Author: Sulochan Acharya <[e-mail]>
+Date:   Thu Nov 1 17:43:39 2012 -0500
+
+    Allows deletion of multiple servers through CLI
+    
+    Adds nargs to argparse for delete command to allow
+    multiple (optional) positional server argument. This
+    allows users to delete multiple servers using nova delete.
+    For example:
+    nova delete xxx yyy aaa zzz will delete valid servers
+    xxx, yyy and zzz and print exception msg for invalid
+    delete of server aaa.
+    
+    Fixes bug892061
+    
+    Change-Id: I2abe6329e489bfbd3e5ae699e97ef098b38c4537
+
+ novaclient/v1_1/shell.py |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit 51faac4a0902ced715c3022985ca4ba7e4aeeaba
+Author: ivan-zhu <[e-mail]>
+Date:   Wed Oct 24 17:31:56 2012 +0800
+
+    Add ability of nova client to display availability zones when listing hosts
+    
+    Implements the one workitem of blueprint apis-for-nova-manage
+    
+    Add an optional parameter for nova host-list
+    Now, we can use the command: nova host-list --zone nova
+    It will return the hosts that availability_zone=nova.
+    This patch depends on https://review.openstack.org/#/c/14741/
+    
+    Change-Id: Ide41e75e7d1471e23d19f51e63a8d9951337a411
+
+ novaclient/v1_1/hosts.py |    7 +++++--
+ novaclient/v1_1/shell.py |    7 +++++--
+ tests/v1_1/fakes.py      |   10 ++++++++++
+ tests/v1_1/test_hosts.py |   12 ++++++++++++
+ tests/v1_1/test_shell.py |    8 ++++++++
+ 5 files changed, 40 insertions(+), 4 deletions(-)
+
+commit f04a24c6ad397439c7f38e381eac1f3b272eba88
+Merge: 7bf93a5 67d4d7e
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 18:07:44 2012 +0000
+
+    Merge "Auto-Assign Flavor ID"
+
+commit 7bf93a52f8828822c8949fe66bc79e8c035d1330
+Author: Russell Cloran <[e-mail]>
+Date:   Mon Oct 29 23:09:26 2012 -0700
+
+    Validate that boolean parameters are boolean
+    
+    Ensure that values which are supposed to be boolean look like correct
+    user input, instead of assuming that any non true-looking input is
+    False.
+    
+    Also, update the flavor manager to raise a CommandError if is_public is
+    not a boolean value.
+    
+    Fixes bug 1059414
+    
+    Change-Id: I3275e4bba103b14081becf91f723f1be060391e5
+
+ novaclient/utils.py        |    8 ++++++--
+ novaclient/v1_1/flavors.py |    6 ++++++
+ tests/v1_1/test_flavors.py |    3 +++
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+commit 67d4d7e0fdc6a990484340299a7920b8d64d6a13
+Author: sathish-nagappan <[e-mail]>
+Date:   Mon Oct 29 14:26:32 2012 -0700
+
+    Auto-Assign Flavor ID
+    
+    Auto-assign a flavor ID if the user enters "auto" for the ID.
+    
+    Change-Id: I745744b9ca44668477635c20df5e2ece6cbf1c27
+
+ novaclient/v1_1/flavors.py |    8 +++-----
+ novaclient/v1_1/shell.py   |    3 ---
+ tests/v1_1/test_flavors.py |    3 ---
+ 3 files changed, 3 insertions(+), 11 deletions(-)
+
+commit 05bbe0fa0efc9abe5461e7e2d3fef7b72d625955
+Merge: 8617a88 2f7b032
+Author: Jenkins <[e-mail]>
+Date:   Fri Oct 26 17:04:24 2012 +0000
+
+    Merge "Pull in latest openstack-common changes and fix a minor PEP8 issue."
+
+commit 2f7b032910cce500f09a5d2a257595d573bdb116
+Author: Josh Kearney <[e-mail]>
+Date:   Thu Oct 25 11:43:56 2012 -0500
+
+    Pull in latest openstack-common changes and fix a minor PEP8 issue.
+    
+    Latest openstack-common commit: d887090b5a31672e4a12f302b3818e2b0933bef0
+    
+    Change-Id: I5a4ffb043ab24f8618a8285112c0c5992ea129e7
+
+ .mailmap                                 |    3 +-
+ novaclient/openstack/common/setup.py     |   97 +++++++++++++++++-------------
+ novaclient/openstack/common/timeutils.py |   21 +++++--
+ tests/test_auth_plugins.py               |    1 -
+ 4 files changed, 73 insertions(+), 49 deletions(-)
+
+commit 8617a88765968341c6dc6e8e44b3d2e6038106a7
+Merge: f100953 805ba8f
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 00:33:46 2012 +0000
+
+    Merge "Exception handling for 'nova flavor-create' arguments"
+
+commit f1009534953ed9662e5fe15f71987263c63d6678
+Merge: 4d3f33d 3463559
+Author: Jenkins <[e-mail]>
+Date:   Tue Oct 23 15:57:57 2012 +0000
+
+    Merge "Add support for backup instance."
+
+commit 4d3f33d141dfc10c553bfc649dbfebf4fe7dec15
+Author: Doug Hellmann <[e-mail]>
+Date:   Mon Oct 22 18:46:41 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: If9e10b065d0c54825fb9138893c78cda3ef79ca2
+    Signed-off-by: Doug Hellmann <[e-mail]>
+
+ setup.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 805ba8fdc1763306f4a6dbdc3de274b5c2597485
+Author: Sathish Nagappan <[e-mail]>
+Date:   Wed Oct 17 21:31:34 2012 -0700
+
+    Exception handling for 'nova flavor-create' arguments
+    
+    Fixes client side Bug #1056935
+    
+    Throws an exception if the user does not input integers for the
+    corresponding parameters.
+    
+    Change-Id: I4c4b8148f6565bc5a3b348dbde8c2cf0da00234a
+
+ novaclient/v1_1/flavors.py |   35 +++++++++++++++++++++++++++++++++++
+ tests/v1_1/test_flavors.py |   23 +++++++++++++++++++++++
+ 2 files changed, 58 insertions(+)
+
+commit 34635597a68d0626f9806c9b1220600a955e0ea4
+Author: TianTian Gao <[e-mail]>
+Date:   Mon Oct 15 14:33:52 2012 +0800
+
+    Add support for backup instance.
+    
+    fix bug: 1066665
+    
+    Change-Id: I1e2c3b2cd9d9e50073b87762973147795059f067
+
+ novaclient/v1_1/servers.py |   26 ++++++++++++++++++++++++++
+ novaclient/v1_1/shell.py   |   13 +++++++++++++
+ tests/v1_1/fakes.py        |    4 ++++
+ tests/v1_1/test_servers.py |    7 +++++++
+ tests/v1_1/test_shell.py   |   12 ++++++++++++
+ 5 files changed, 62 insertions(+)
+
+commit e8c22cd130759fc6ab89c027cf34df19333878b9
+Merge: ccabbe7 81c01e5
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 10 16:57:11 2012 +0000
+
+    Merge "Encode user data to utf-8 when creating a server"
+
+commit ccabbe77de4a411f8728236969e9a5a50ec79a65
+Merge: c8696a5 ccc4291
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 10 04:00:52 2012 +0000
+
+    Merge "Add simple os-api extension cli extension"
+
+commit ccc4291c52eb4f68e37691bbe7df34450e89df7a
+Author: Joshua Harlow <[e-mail]>
+Date:   Tue Sep 18 16:36:17 2012 -0700
+
+    Add simple os-api extension cli extension
+    
+    Add a useful extension that will show you what
+    openstack api extensions are available for usage
+    and print out the result into a nice little table.
+    
+    Useful as a example for others to base contrib/
+    extensions off of.
+    
+    Example @ http://paste.openstack.org/show/20989/
+    
+    Change-Id: I5b72f5ea73c00f1c1a0f09f670d744c820e05837
+
+ novaclient/v1_1/contrib/list_extensions.py |   46 +++++++++++++++++++++++++
+ tests/v1_1/contrib/test_list_extensions.py |   21 ++++++++++++
+ tests/v1_1/fakes.py                        |   50 +++++++++++++++++++++++++++-
+ 3 files changed, 116 insertions(+), 1 deletion(-)
+
+commit c8696a59e32ccd0d20dafa86a85379dd7e214a77
+Merge: 6a86308 a9a66ae
+Author: Jenkins <[e-mail]>
+Date:   Thu Oct 4 22:52:20 2012 +0000
+
+    Merge "Raises Exception on improper Auth Configuration"
+
+commit 6a8630867f0563e2699caf35d3669f8e83256c5f
+Merge: aa171ca f391591
+Author: Jenkins <[e-mail]>
+Date:   Thu Oct 4 21:47:10 2012 +0000
+
+    Merge "Add missing port-id usage info."
+
+commit a9a66ae7a750e507a0dda4bc9b2f9f62b9cd98a2
+Author: Stef T <[e-mail]>
+Date:   Thu Oct 4 16:20:23 2012 -0400
+
+    Raises Exception on improper Auth Configuration
+    
+    Addresses bug 1061848.
+    
+    Basically, this bug comes about from not properly
+    setting up the auth_system for novaclient. In this
+    case, an exception of EndPointNotFound is flung.
+    
+    Change-Id: I12533aefd9d0425dd83e2e4c63f4dd5ff6faae71
+
+ novaclient/client.py       |    2 ++
+ tests/test_auth_plugins.py |   24 ++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+
+commit aa171ca12b336f9a927dbdec0d598f30386b6501
+Author: Vincent Untz <[e-mail]>
+Date:   Fri Sep 28 12:42:37 2012 +0200
+
+    Do not prefer ALL_TENANTS environment variable to command line arguments
+    
+    As pointed out in https://review.openstack.org/#/c/13708/ command line
+    arguments should have higher priority.
+    
+    Also, do not fail if the environment variable is not representing an
+    int.
+    
+    Change-Id: Ie6cd5b2d6aae47236ba0fe6d594d0c8095e9e422
+
+ novaclient/v1_1/shell.py |   15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+commit 81c01e535cecc54c2e6e847000638b52fec506af
+Author: Vincent Untz <[e-mail]>
+Date:   Fri Sep 28 11:48:38 2012 +0200
+
+    Encode user data to utf-8 when creating a server
+    
+    This is needed for data that we don't read from IO directly, since we're
+    base64-encoding the user data, and this requires ther user data to not
+    be of the unicode type.
+    
+    We're being tolerant, as we'll accept user data that is already in a str
+    object.
+    
+    Fixes: bug 1049161
+    Change-Id: I4320670de564c8029c7aef14da2492c6f8752efe
+
+ novaclient/v1_1/base.py    |    2 ++
+ tests/v1_1/test_servers.py |   34 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+)
+
+commit c01fae73700047072a1a27add416eb61ee5cb1b0
+Author: Vincent Untz <[e-mail]>
+Date:   Wed Sep 26 14:54:57 2012 +0200
+
+    Add --all-tenants option to volume-list
+    
+    The list and secgroup-list commands have this option, and
+    nova-volume/cinder respect this search option too nowadays.
+    
+    Change-Id: Ie95432727dec9702e09a0ce314bf418f6a36b799
+
+ novaclient/v1_1/shell.py   |   19 +++++++++++++++++--
+ novaclient/v1_1/volumes.py |   14 +++++++++++---
+ 2 files changed, 28 insertions(+), 5 deletions(-)
+
 commit cdebf729b06d9465ab080fd5b15e433f70f8fe45
 Merge: e01c25b 02d3aad
 Author: Jenkins <[e-mail]>
@@ -473,6 +1294,17 @@
  tests/v1_1/test_shell.py         |    4 ++-
  9 files changed, 242 insertions(+), 6 deletions(-)
 
+commit f391591713a3bd16c521a68063a2c529c5f62ccb
+Author: Yaguang Tang <[e-mail]>
+Date:   Mon Aug 27 16:03:46 2012 +0800
+
+    Add missing port-id usage info.
+    
+    Change-Id: I3e5de32265512c0f692bda6d322c95be0d1b8851
+
+ novaclient/v1_1/shell.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit ae431aba0d3829728d7e7fda6053f8eb4c417759
 Merge: 8ccd905 52d24b1
 Author: Jenkins <[e-mail]>
@@ -1147,7 +1979,7 @@
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 commit d4c9b12f39501186e812fba31c314bf813a4cfc0
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Tue Jun 26 11:34:31 2012 -0500
 
     Indicate unused variables and other misc. house cleaning.
@@ -1349,7 +2181,7 @@
     Merge "Move docs to doc."
 
 commit 8dce04a1cf4ed7f04b0677c451947283e20047e6
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Jun 13 10:03:23 2012 -0500
 
     Removes NOVACLIENT_DEBUG from client code.
@@ -1451,7 +2283,7 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 051aa3d7dd54a453165a839dee9e2bb6de203abf
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Jun 11 11:44:38 2012 -0500
 
     Removed generate_authors.sh since it's no longer used.
@@ -1830,7 +2662,7 @@
  2 files changed, 2 insertions(+), 19 deletions(-)
 
 commit 765f551a267f07e43eb3acb92835ac7e5d6ca31b
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Apr 12 14:16:31 2012 -0500
 
     Rename NOVA_VERSION to OS_COMPUTE_API_VERSION.
@@ -1977,7 +2809,7 @@
  2 files changed, 4 insertions(+), 11 deletions(-)
 
 commit f6014dd8c530e121ae96a53ae6664bc24eb85781
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Apr 2 12:27:30 2012 -0500
 
     Miscellaneous code cleanup.
@@ -2739,7 +3571,7 @@
     Merge "Fix bug 904364: Consistiently handle trailing '/' on URLs"
 
 commit 3f9c3a6f1a57b11c05e162df0d1be9500b41dae3
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Feb 9 14:34:12 2012 -0600
 
     Properly handle KeyErrors.
@@ -4017,7 +4849,7 @@
  32 files changed, 35 insertions(+), 53 deletions(-)
 
 commit 6509fe253f9e40f217d6c483941af6fa56bc23f7
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Tue Dec 13 15:54:09 2011 -0600
 
     Add support for RAX authentication.
@@ -4289,7 +5121,7 @@
     Merge "Rewriting admin-only calls as server actions"
 
 commit 149e00bcf5eeb16e4e5cc13840cdb6d0fe2897e3
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Nov 16 15:21:25 2011 -0600
 
     Adds bash completion support and cleans up setup.py.
@@ -4577,7 +5409,7 @@
 
 commit beb40d3adcc15e57d72678be1c1a5aa522b9520f
 Merge: fcfa928 05a1ef7
-Author: Chris Behrens <[e-mail]>
+Author: comstud <[e-mail]>
 Date:   Fri Nov 4 11:53:07 2011 -0700
 
     Merge pull request #147 from SandyWalsh/flavors_are_strings
@@ -5129,7 +5961,7 @@
 
 commit 19d11e39ae4a5ac660c7ba25b9f360c844a65deb
 Merge: 4b6345e acf8a27
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Tue Sep 27 14:03:59 2011 -0700
 
     Merge pull request #121 from gagupta/master
@@ -5452,7 +6284,7 @@
 
 commit 6b56f3be13956f2e6158f860fbfa9215e1bd6b30
 Merge: ba96890 07795ce
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Sep 2 09:01:49 2011 -0700
 
     Merge pull request #111 from klmitch/loaded-zones
@@ -5531,7 +6363,7 @@
 
 commit be53d30569f62e4018a58ef7662fbd88d041f905
 Merge: fe3dbf0 6b4791b
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:50:12 2011 -0700
 
     Merge pull request #104 from throughnothing/instance_metadata
@@ -5540,7 +6372,7 @@
 
 commit fe3dbf056521a3ccaf6c3b90eb495fae7a281437
 Merge: 51610e9 25977cd
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:46:25 2011 -0700
 
     Merge pull request #106 from chmouel/fix-unittest-breakage
@@ -5558,7 +6390,7 @@
 
 commit 51610e9949fbd1baa39899046f89378eeac58014
 Merge: 2b1b109 7c8ae25
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:38:31 2011 -0700
 
     Merge pull request #105 from chmouel/fix-unittest-breakage
@@ -5579,7 +6411,7 @@
 
 commit 2b1b109aab24ab639bf8a5c16588bde75a8ca8d1
 Merge: 230c4f4 c31aeb1
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:07:37 2011 -0700
 
     Merge pull request #101 from basak/master
@@ -5588,7 +6420,7 @@
 
 commit 230c4f4bea57ae27641a1287fc6897da9a1d7368
 Merge: 3507905 14c2bd2
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:04:17 2011 -0700
 
     Merge pull request #100 from throughnothing/image_metadata
@@ -5597,7 +6429,7 @@
 
 commit 3507905a7aa0e9463535d5de8aa56c753c7e6ccc
 Merge: 3f22be9 40333f0
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 13:02:54 2011 -0700
 
     Merge pull request #99 from chmouel/no-auth-url-error
@@ -5648,7 +6480,7 @@
 
 commit c35bd291e399c2bfb8ba80889153f476bb3171a3
 Merge: 597ef2f 526c5ce
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Sep 1 10:33:30 2011 -0700
 
     Merge pull request #103 from SandyWalsh/fix_2_6_5_tests
@@ -6038,7 +6870,7 @@
 
 commit 72d41b1e38034f5d7aedc849d85e7f670aca529a
 Merge: 3c254c0 dd37389
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Aug 24 10:38:58 2011 -0700
 
     Merge pull request #88 from bcwaldon/rebuild-adminPass
@@ -6148,7 +6980,7 @@
 
 commit 79a34e9dbba3e87e63832084c02f114d25a7a8ef
 Merge: f361298 0d997e0
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 22 10:04:10 2011 -0700
 
     Merge pull request #79 from cloudbuilders/quota-fixes
@@ -6157,7 +6989,7 @@
 
 commit f361298676e14068e4495e04199e2aba42d6c2cd
 Merge: c42b374 328a425
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 22 10:01:28 2011 -0700
 
     Merge pull request #84 from cloudbuilders/shell-test-fixes
@@ -6175,7 +7007,7 @@
 
 commit c42b374ed8b6ea4b7fb43125c6100c40214f6247
 Merge: 66ecf7c b8f5c91
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Aug 18 15:17:46 2011 -0700
 
     Merge pull request #83 from jk0/master
@@ -6183,7 +7015,7 @@
     Fixed 1.0 and unit tests.
 
 commit b8f5c91f864e50ea3e94aa23be37a7b8171eeae2
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Aug 18 17:16:38 2011 -0500
 
     Fixed 1.0 and unit tests.
@@ -6203,7 +7035,7 @@
     Updated rescue in 1.0 and added unit tests.
 
 commit fb72dff889b05cbcd12694b771cdef8ccfd7bb4f
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Aug 18 12:04:55 2011 -0500
 
     Added support for 1.0 and added unit tests.
@@ -6226,7 +7058,7 @@
     Update rescue/unrescue calls to use public API
 
 commit b9d194e99dede7686df1a7f8ee96908ace0ab0f2
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Aug 18 11:51:26 2011 -0500
 
     Updated rescue/unrescue to use public API.
@@ -6341,7 +7173,7 @@
 
 commit a97722dedf490c7546b99e10f68be406e9f9468a
 Merge: 4294327 2b70b75
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Sat Aug 13 08:59:15 2011 -0700
 
     Merge pull request #73 from cloudbuilders/more_keystonization
@@ -6385,7 +7217,7 @@
 
 commit 42943277a05d22c9ee4047aaf369440d23102631
 Merge: d14d2b0 fc8e5e3
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Aug 12 07:24:33 2011 -0700
 
     Merge pull request #72 from comstud/search-fixups
@@ -6509,7 +7341,7 @@
 
 commit 064a98bb724f8153e06c247eb534c0b6c206bd80
 Merge: 5ece6de 5f64a85
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Aug 10 12:00:27 2011 -0700
 
     Merge pull request #56 from cloudbuilders/keypairs
@@ -6622,7 +7454,7 @@
  1 file changed, 5 insertions(+)
 
 commit 461d3e7e2f000619a6113c340e39cbcbb95e58e9
-Author: Andy Smith <[e-mail]>
+Author: termie <[e-mail]>
 Date:   Tue Aug 9 13:12:09 2011 -0700
 
     add license headers
@@ -6632,7 +7464,7 @@
  2 files changed, 30 insertions(+)
 
 commit 17208cec6a77f939c68e393c7d3c23695bb35dbb
-Author: Andy Smith <[e-mail]>
+Author: termie <[e-mail]>
 Date:   Mon Aug 8 14:48:07 2011 -0700
 
     add support for quotas
@@ -6644,7 +7476,7 @@
  4 files changed, 131 insertions(+)
 
 commit dfa2c86087554c59b08fc035624f8afa31534c4b
-Author: Nikolay Sokolov <[e-mail]>
+Author: Nokolay Sokolov <[e-mail]>
 Date:   Tue Aug 9 01:44:01 2011 +0400
 
     pep8, again
@@ -6653,7 +7485,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit eff34ef4013912426be511c3235adab1eac305c5
-Author: Nikolay Sokolov <[e-mail]>
+Author: Nokolay Sokolov <[e-mail]>
 Date:   Tue Aug 9 01:41:51 2011 +0400
 
     Recursion handling.
@@ -6662,7 +7494,7 @@
  1 file changed, 20 insertions(+), 15 deletions(-)
 
 commit c8b3b13615d4b3874c792549a8467e88575138b9
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 8 16:06:31 2011 -0500
 
     Added .mailmap file for AUTHORS.
@@ -6673,7 +7505,7 @@
 
 commit 360ee0a34b37edd71525708127f5bed6e43f5e9b
 Merge: 811ba10 f39ca09
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 8 13:58:13 2011 -0700
 
     Merge pull request #64 from piston/conform_to_openstack_standards
@@ -6715,7 +7547,7 @@
 
 commit 811ba10e51ae4903c0e5fa46e1a697eaf137f5a5
 Merge: 2072f88 6d1361c
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 8 13:34:19 2011 -0700
 
     Merge pull request #61 from bcwaldon/boot_output
@@ -6724,7 +7556,7 @@
 
 commit 2072f88dcd09e86d06d0cae8a267541767ad453c
 Merge: 7e5a474 536be15
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Mon Aug 8 13:33:38 2011 -0700
 
     Merge pull request #63 from cloudbuilders/whitespace_cleanups
@@ -6732,7 +7564,7 @@
     Whitespace cleanups
 
 commit e52d095a46f4d486db6bb58717b09d5fc3642797
-Author: Nikolay Sokolov <[e-mail]>
+Author: Nokolay Sokolov <[e-mail]>
 Date:   Tue Aug 9 00:28:46 2011 +0400
 
     pep8
@@ -6741,7 +7573,7 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit b3af99fa15629ec20d84eedd931ec5d3d0c43034
-Author: Nikolay Sokolov <[e-mail]>
+Author: Nokolay Sokolov <[e-mail]>
 Date:   Tue Aug 9 00:26:41 2011 +0400
 
     Status code 305 fix, ClientExceptions if we can not handle response
@@ -6750,7 +7582,7 @@
  1 file changed, 12 insertions(+), 7 deletions(-)
 
 commit 536be15a8777963d9151f36bfdecc85b39b9656b
-Author: Andy Smith <[e-mail]>
+Author: termie <[e-mail]>
 Date:   Mon Aug 8 13:20:44 2011 -0700
 
     whitespace cleanups
@@ -6862,7 +7694,7 @@
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 commit 5853354a7bdbe56053bd286873a0d2305c7c858b
-Author: Nikolay Sokolov <[e-mail]>
+Author: Nokolay Sokolov <[e-mail]>
 Date:   Tue Aug 9 00:06:55 2011 +0400
 
     Redirection handling.
@@ -6922,7 +7754,7 @@
 
 commit f5a078c7eb7f3ae49a8bed9f88d47e52cab7c561
 Merge: ae1b052 4a4e9a6
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Aug 5 11:26:27 2011 -0700
 
     Merge pull request #52 from Cerberus98/dead_bodies_redux
@@ -6944,7 +7776,7 @@
  6 files changed, 26 insertions(+), 30 deletions(-)
 
 commit ae1b0521f04998725ebcad71b92e4085bf11ff8b
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Aug 5 10:38:29 2011 -0500
 
     Corrected docs.
@@ -7025,13 +7857,13 @@
 
 commit be3a11d27e4753240417859191bf49452df37a22
 Merge: 6b4e9c5 008b43f
-Author: Antony Messerli <[e-mail]>
+Author: root <[e-mail]>
 Date:   Thu Aug 4 18:40:54 2011 +0000
 
     Merge branch 'v1.1-split-and-support' of http://github.com/blamarvt/python-novaclient into v1.1-formatting
 
 commit 6b4e9c5c8b79671d6bdf633d22a61eda0638f01f
-Author: Antony Messerli <[e-mail]>
+Author: root <[e-mail]>
 Date:   Thu Aug 4 18:39:21 2011 +0000
 
     formatting updates
@@ -7295,7 +8127,7 @@
 
 commit 4b8879a8eb3fb80494ff16d4b96490fec9aa2161
 Merge: 20251cc 40a2bf9
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jul 29 12:44:50 2011 -0700
 
     Merge pull request #39 from bcwaldon/master
@@ -7337,7 +8169,7 @@
 
 commit 20251ccc2ff7a8d030647c92c9a5a288ed5c1229
 Merge: 25596fe d72ea5d
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Jul 13 11:03:56 2011 -0700
 
     Merge pull request #32 from SandyWalsh/master
@@ -7355,7 +8187,7 @@
 
 commit 25596fef72b3b32a37bae2d2e4c9188953d834b5
 Merge: 5560117 1920e32
-Author: Chris Behrens <[e-mail]>
+Author: comstud <[e-mail]>
 Date:   Tue Jul 12 15:11:08 2011 -0700
 
     Merge pull request #31 from SandyWalsh/master
@@ -7413,7 +8245,7 @@
 
 commit ecc2ede1b1e1a75b4d78c985d147f40814511ece
 Merge: f1a8117 5f08840
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jul 8 12:15:58 2011 -0700
 
     Merge pull request #28 from jerdfelt/master
@@ -7422,7 +8254,7 @@
 
 commit f1a81175ec997b6fb0eb990c7ed8a9ce6672635b
 Merge: 0118cb3 2bba8e2
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jul 8 12:14:26 2011 -0700
 
     Merge pull request #29 from SandyWalsh/2bba8e2e2b08a53d7dea828047406074826d7622
@@ -7460,7 +8292,7 @@
 
 commit 0118cb316158c8f11b635bfb08dcaee43b4e6218
 Merge: f81fc89 eb0d5c7
-Author: Chris Behrens <[e-mail]>
+Author: comstud <[e-mail]>
 Date:   Thu Jul 7 15:15:23 2011 -0700
 
     Merge pull request #27 from EdLeafe/master
@@ -7487,7 +8319,7 @@
     Migrations!
 
 commit 9b31d54aa2b08a59c7e7f67ba78a0e8e0ae3e88e
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jul 7 13:33:17 2011 -0500
 
     Added migration functionality.
@@ -7501,7 +8333,7 @@
 
 commit ede425d3abfd62412d4d449006936350994d4a67
 Merge: c1b1420 cee51f8
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Tue Jun 28 12:54:50 2011 -0700
 
     Merge pull request #25 from jk0/master
@@ -7509,7 +8341,7 @@
     Refactored backup rotation code.
 
 commit cee51f8aff494c1e7dd266e2a24c9dc9bb7b18f8
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 24 14:48:14 2011 -0500
 
     Refactored backup rotation.
@@ -7532,7 +8364,7 @@
     Implement backup with rotation.
 
 commit 8a523431e3db9a1390933036532dc9f2ffacf17f
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 24 13:27:02 2011 -0500
 
     Review feedback.
@@ -7541,7 +8373,7 @@
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 518ca43ef758c08b29d87ac238483d29ce3fc6ea
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 24 13:22:20 2011 -0500
 
     Fixed unit tests.
@@ -7571,13 +8403,13 @@
 
 commit ff87b8c449cd5eee042d91c5dc4ad4f98bc184cb
 Merge: 787b369 04ef226
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 24 12:25:45 2011 -0500
 
     Merge branch 'backups'
 
 commit 04ef22667633672d0f14eec49fe6ac3ef26200c6
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 24 12:24:26 2011 -0500
 
     Implemented backup with rotation.
@@ -7622,7 +8454,7 @@
 
 commit 787b369e6c9cfd402f37ffe81bb54b18a8b55fdb
 Merge: a5ef8fc 9e86dd0
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jun 23 16:10:53 2011 -0700
 
     Merge pull request #21 from comstud/master
@@ -7631,7 +8463,7 @@
 
 commit a5ef8fc5bc6e9c1a170d5fe617f09e4b6ae59258
 Merge: 459e51b 5b566a0
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jun 23 16:10:06 2011 -0700
 
     Merge pull request #21 from comstud/master
@@ -7793,7 +8625,7 @@
 
 commit 4417c96e1e973a91c95de260228b243720fbb9f6
 Merge: 7edce02 6aa43b1
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Fri Jun 17 08:46:46 2011 -0700
 
     Merge pull request #19 from Cerberus98/instance_for_accounts
@@ -7894,14 +8726,14 @@
 
 commit 3c10087824c7c04c47de92fa4fbb075afefce80f
 Merge: d778d42 c100f21
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jun 9 12:59:05 2011 -0500
 
     Merge branch 'master' of github.com:rackspace/python-novaclient
 
 commit c100f21d3d01e661e92a7961a7963604d097be83
 Merge: 117e455 182b3a7
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jun 9 10:11:09 2011 -0700
 
     Merge pull request #12 from klmitch/master
@@ -7909,7 +8741,7 @@
     Add add_fixed_ip() and remove_fixed_ip() on servers
 
 commit d778d4278e952b33cd0bd4fcc08a3e589fdbb223
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Jun 9 10:38:01 2011 -0500
 
     Don't restrict ids to int.
@@ -8350,7 +9182,7 @@
 
 commit 27709a3e245826b75c1397ef643c9b98f59b3a7c
 Merge: 560c314 c65a0a1
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Thu Feb 17 16:12:16 2011 -0600
 
     Merge remote branch 'SandyWalsh/master'
@@ -8375,7 +9207,7 @@
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 560c314666d644975e531b40fe4d37a213583ea9
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Wed Feb 16 11:10:13 2011 -0600
 
     Added full flavor detail support
@@ -8572,7 +9404,7 @@
  1 file changed, 9 insertions(+)
 
 commit 7304ed80df265b3b11a0018a826ce2e38c052572
-Author: Josh Kearney <[e-mail]>
+Author: Josh Kearney <[e-mail]>
 Date:   Tue Jan 25 14:01:22 2011 -0600
 
     Initial commit from fork

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-09-27 08:59:05 +0000
+++ PKG-INFO	2012-11-30 14:02:33 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-novaclient
-Version: 2.9.0
+Version: 2.10.0
 Summary: Client library for OpenStack Nova API.
 Home-page: https://github.com/openstack/python-novaclient
 Author: Rackspace, based on work by Jacob Kaplan-Moss
@@ -269,6 +269,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 'debian/changelog'
--- debian/changelog	2012-09-28 11:57:15 +0000
+++ debian/changelog	2012-11-30 14:02:33 +0000
@@ -1,3 +1,15 @@
+python-novaclient (1:2.10.0-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <[e-mail]>  Fri, 30 Nov 2012 08:00:21 -0600
+
+python-novaclient (1:2.10.0-0ubuntu1) raring; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Nov 2012 14:30:55 -0600
+
 python-novaclient (1:2.9.0-0ubuntu1~cloud0) precise-folsom; urgency=low
 
   * New upstream snapshot for the Ubuntu Cloud Archive. 

=== modified file 'novaclient/client.py'
--- novaclient/client.py	2012-09-27 08:59:05 +0000
+++ novaclient/client.py	2012-11-30 14:02:33 +0000
@@ -95,6 +95,8 @@
         self.projectid = projectid
         if not auth_url and auth_system and auth_system != 'keystone':
             auth_url = get_auth_system_url(auth_system)
+            if not auth_url:
+                raise exceptions.EndpointNotFound()
         self.auth_url = auth_url.rstrip('/')
         self.version = 'v1.1'
         self.region_name = region_name
@@ -307,7 +309,7 @@
 
     def authenticate(self):
         if has_keyring:
-            keys = [self.auth_url, self.user, self.region_name,
+            keys = [self.auth_url, self.projectid, self.user, self.region_name,
                     self.endpoint_type, self.service_type, self.service_name,
                     self.volume_service_name]
             for index, key in enumerate(keys):

=== modified file 'novaclient/openstack/common/setup.py'
--- novaclient/openstack/common/setup.py	2012-09-27 08:59:05 +0000
+++ novaclient/openstack/common/setup.py	2012-11-30 14:02:33 +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 = ['%s>' % x.strip() for x in
-                                          l.split('>')][:2]
-                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 []
 
 
@@ -140,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():
@@ -166,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
@@ -212,7 +229,7 @@
 
 def read_versioninfo(project):
     """Read the versioninfo file. If it doesn't exist, we're in a github
-       zipball, and there's really know way to know what version we really
+       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')
@@ -226,7 +243,8 @@
 
 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():
@@ -317,7 +335,8 @@
 
 
 def get_pre_version(projectname, base_version):
-    """Return a version which is based"""
+    """Return a version which is leading up to a version that will
+       be released in the future."""
     if os.path.isdir('.git'):
         current_tag = _get_git_current_tag()
         if current_tag is not None:
@@ -329,10 +348,10 @@
             version_suffix = _get_git_next_version_suffix(branch_name)
             version = "%s~%s" % (base_version, version_suffix)
         write_versioninfo(projectname, version)
-        return version.split('~')[0]
+        return version
     else:
         version = read_versioninfo(projectname)
-    return version.split('~')[0]
+    return version
 
 
 def get_post_version(projectname):

=== modified file 'novaclient/openstack/common/timeutils.py'
--- novaclient/openstack/common/timeutils.py	2012-09-07 18:32:24 +0000
+++ novaclient/openstack/common/timeutils.py	2012-11-30 14:02:33 +0000
@@ -62,9 +62,11 @@
 
 
 def normalize_time(timestamp):
-    """Normalize time in arbitrary timezone to UTC"""
+    """Normalize time in arbitrary timezone to UTC naive object"""
     offset = timestamp.utcoffset()
-    return timestamp.replace(tzinfo=None) - offset if offset else timestamp
+    if offset is None:
+        return timestamp
+    return timestamp.replace(tzinfo=None) - offset
 
 
 def is_older_than(before, seconds):
@@ -72,6 +74,11 @@
     return utcnow() - before > datetime.timedelta(seconds=seconds)
 
 
+def is_newer_than(after, seconds):
+    """Return True if after is newer than seconds."""
+    return after - utcnow() > datetime.timedelta(seconds=seconds)
+
+
 def utcnow_ts():
     """Timestamp version of our utcnow function."""
     return calendar.timegm(utcnow().timetuple())
@@ -121,6 +128,10 @@
 
 def unmarshall_time(tyme):
     """Unmarshall a datetime dict."""
-    return datetime.datetime(day=tyme['day'], month=tyme['month'],
-                 year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'],
-                 second=tyme['second'], microsecond=tyme['microsecond'])
+    return datetime.datetime(day=tyme['day'],
+                             month=tyme['month'],
+                             year=tyme['year'],
+                             hour=tyme['hour'],
+                             minute=tyme['minute'],
+                             second=tyme['second'],
+                             microsecond=tyme['microsecond'])

=== modified file 'novaclient/shell.py'
--- novaclient/shell.py	2012-09-27 08:59:05 +0000
+++ novaclient/shell.py	2012-11-30 14:02:33 +0000
@@ -24,6 +24,7 @@
 import imp
 import itertools
 import os
+import pkg_resources
 import pkgutil
 import sys
 import logging
@@ -257,7 +258,8 @@
         extensions = []
         for name, module in itertools.chain(
                 self._discover_via_python_path(),
-                self._discover_via_contrib_path(version)):
+                self._discover_via_contrib_path(version),
+                self._discover_via_entry_points()):
 
             extension = novaclient.extension.Extension(name, module)
             extensions.append(extension)
@@ -289,6 +291,13 @@
             module = imp.load_source(name, ext_path)
             yield name, module
 
+    def _discover_via_entry_points(self):
+        for ep in pkg_resources.iter_entry_points('novaclient.extension'):
+            name = ep.name
+            module = ep.load()
+
+            yield name, module
+
     def _add_bash_completion_subparser(self, subparsers):
         subparser = subparsers.add_parser('bash_completion',
             add_help=False,
@@ -356,7 +365,7 @@
                 options.os_compute_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
 

=== modified file 'novaclient/utils.py'
--- novaclient/utils.py	2012-09-07 18:32:24 +0000
+++ novaclient/utils.py	2012-11-30 14:02:33 +0000
@@ -48,9 +48,13 @@
     if not val:
         return False
     try:
-        return True if bool(int(val)) else False
+        return bool(int(val))
     except ValueError:
-        return val.lower() in ['true', 'yes', 'y']
+        if val.lower() in ['true', 'yes', 'y']:
+            return True
+        if val.lower() in ['false', 'no', 'n']:
+            return False
+        raise
 
 
 def add_resource_manager_extra_kwargs_hook(f, hook):
@@ -171,10 +175,15 @@
     """Helper for the _find_* methods."""
     # first try to get entity as integer id
     try:
-        if isinstance(name_or_id, int) or name_or_id.isdigit():
+        is_intid = isinstance(name_or_id, int) or name_or_id.isdigit()
+    except AttributeError:
+        is_intid = False
+
+    if is_intid:
+        try:
             return manager.get(int(name_or_id))
-    except exceptions.NotFound:
-        pass
+        except exceptions.NotFound:
+            pass
 
     # now try to get entity as uuid
     try:

=== modified file 'novaclient/v1_1/base.py'
--- novaclient/v1_1/base.py	2012-09-27 08:59:05 +0000
+++ novaclient/v1_1/base.py	2012-11-30 14:02:33 +0000
@@ -66,12 +66,14 @@
         """
         body = {"server": {
             "name": name,
-            "imageRef": str(base.getid(image)),
+            "imageRef": str(base.getid(image)) if image else '',
             "flavorRef": str(base.getid(flavor)),
         }}
         if userdata:
             if hasattr(userdata, 'read'):
                 userdata = userdata.read()
+            elif isinstance(userdata, unicode):
+                userdata = userdata.encode('utf-8')
             body["server"]["user_data"] = base64.b64encode(userdata)
         if meta:
             body["server"]["metadata"] = meta

=== modified file 'novaclient/v1_1/client.py'
--- novaclient/v1_1/client.py	2012-09-07 18:32:24 +0000
+++ novaclient/v1_1/client.py	2012-11-30 14:02:33 +0000
@@ -7,6 +7,7 @@
 from novaclient.v1_1 import floating_ip_dns
 from novaclient.v1_1 import floating_ips
 from novaclient.v1_1 import floating_ip_pools
+from novaclient.v1_1 import fping
 from novaclient.v1_1 import hosts
 from novaclient.v1_1 import hypervisors
 from novaclient.v1_1 import images
@@ -23,6 +24,8 @@
 from novaclient.v1_1 import volumes
 from novaclient.v1_1 import volume_snapshots
 from novaclient.v1_1 import volume_types
+from novaclient.v1_1 import services
+from novaclient.v1_1 import fixed_ips
 
 
 class Client(object):
@@ -54,6 +57,7 @@
         # FIXME(comstud): Rename the api_key argument above when we
         # know it's not being used as keyword argument
         password = api_key
+        self.project_id = project_id
         self.flavors = flavors.FlavorManager(self)
         self.flavor_access = flavor_access.FlavorAccessManager(self)
         self.images = images.ImageManager(self)
@@ -67,6 +71,7 @@
         self.certs = certs.CertificateManager(self)
         self.floating_ips = floating_ips.FloatingIPManager(self)
         self.floating_ip_pools = floating_ip_pools.FloatingIPPoolManager(self)
+        self.fping = fping.FpingManager(self)
         self.volumes = volumes.VolumeManager(self)
         self.volume_snapshots = volume_snapshots.SnapshotManager(self)
         self.volume_types = volume_types.VolumeTypeManager(self)
@@ -83,6 +88,8 @@
         self.aggregates = aggregates.AggregateManager(self)
         self.hosts = hosts.HostManager(self)
         self.hypervisors = hypervisors.HypervisorManager(self)
+        self.services = services.ServiceManager(self)
+        self.fixed_ips = fixed_ips.FixedIPsManager(self)
 
         # Add in any extensions...
         if extensions:

=== modified file 'novaclient/v1_1/cloudpipe.py'
--- novaclient/v1_1/cloudpipe.py	2012-04-02 11:29:59 +0000
+++ novaclient/v1_1/cloudpipe.py	2012-11-30 14:02:33 +0000
@@ -16,6 +16,7 @@
 """Cloudpipe interface."""
 
 from novaclient import base
+from novaclient.v1_1 import networks
 
 
 class Cloudpipe(base.Resource):
@@ -46,3 +47,16 @@
         Get a list of cloudpipe instances.
         """
         return self._list('/os-cloudpipe', 'cloudpipes')
+
+    def update(self, address, port):
+        """
+        Update VPN address and port for all networks associated
+        with the project defined by authentication
+
+        :param address: IP address
+        :param port: Port number
+        """
+
+        body = {'configure_project': {'vpn_ip': address,
+                                      'vpn_port': port}}
+        self._update("/os-cloudpipe/configure-project", body)

=== added file 'novaclient/v1_1/contrib/list_extensions.py'
--- novaclient/v1_1/contrib/list_extensions.py	1970-01-01 00:00:00 +0000
+++ novaclient/v1_1/contrib/list_extensions.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,46 @@
+# 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 novaclient import base
+from novaclient 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')
+
+
+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)

=== added file 'novaclient/v1_1/fixed_ips.py'
--- novaclient/v1_1/fixed_ips.py	1970-01-01 00:00:00 +0000
+++ novaclient/v1_1/fixed_ips.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,58 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+# 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.
+
+"""
+Fixed IPs interface.
+"""
+
+from novaclient import base
+
+
+class FixedIP(base.Resource):
+    def __repr__(self):
+        return "<FixedIP: %s>" % self.address
+
+
+class FixedIPsManager(base.ManagerWithFind):
+    resource_class = FixedIP
+
+    def get(self, fixed_ip):
+        """
+        Show information for a Fixed IP
+
+        :param fixed_ip: Fixed IP address to get info for
+        """
+        return self._get('/os-fixed-ips/%s' % base.getid(fixed_ip),
+                         "fixed_ip")
+
+    def reserve(self, fixed_ip):
+        """Reserve a Fixed IP
+
+        :param fixed_ip: Fixed IP address to reserve
+        """
+        body = {"reserve": None}
+        self.api.client.post('/os-fixed-ips/%s/action' % base.getid(fixed_ip),
+                             body=body)
+
+    def unreserve(self, fixed_ip):
+        """Unreserve a Fixed IP
+
+        :param fixed_ip: Fixed IP address to unreserve
+        """
+        body = {"unreserve": None}
+        self.api.client.post('/os-fixed-ips/%s/action' % base.getid(fixed_ip),
+                             body=body)

=== modified file 'novaclient/v1_1/flavors.py'
--- novaclient/v1_1/flavors.py	2012-09-27 08:59:05 +0000
+++ novaclient/v1_1/flavors.py	2012-11-30 14:02:33 +0000
@@ -5,6 +5,7 @@
 
 from novaclient import base
 from novaclient import exceptions
+from novaclient import utils
 
 
 class Flavor(base.Resource):
@@ -103,8 +104,8 @@
         """
         self._delete("/flavors/%s" % base.getid(flavor))
 
-    def create(self, name, ram, vcpus, disk, flavorid,
-               ephemeral=0, swap=0, rxtx_factor=1, is_public=True):
+    def create(self, name, ram, vcpus, disk, flavorid=None,
+               ephemeral=0, swap=0, rxtx_factor=1.0, is_public=True):
         """
         Create (allocate) a  floating ip for a tenant
 
@@ -112,23 +113,63 @@
         :param ram: Memory in MB for the flavor
         :param vcpu: Number of VCPUs for the flavor
         :param disk: Size of local disk in GB
-        :param flavorid: Integer ID for the flavor
+        :param flavorid: ID for the flavor (optional). You can use the reserved
+                         value ``"auto"`` to have Nova generate a UUID for the
+                         flavor in cases where you cannot simply pass ``None``.
         :param swap: Swap space in MB
         :param rxtx_factor: RX/TX factor
         :rtype: :class:`Flavor`
         """
 
+        try:
+            ram = int(ram)
+        except:
+            raise exceptions.CommandError("Ram must be an integer.")
+
+        try:
+            vcpus = int(vcpus)
+        except:
+            raise exceptions.CommandError("VCPUs must be an integer.")
+
+        try:
+            disk = int(disk)
+        except:
+            raise exceptions.CommandError("Disk must be an integer.")
+
+        if flavorid == "auto":
+            flavorid = None
+
+        try:
+            swap = int(swap)
+        except:
+            raise exceptions.CommandError("Swap must be an integer.")
+
+        try:
+            ephemeral = int(ephemeral)
+        except:
+            raise exceptions.CommandError("Ephemeral must be an integer.")
+
+        try:
+            rxtx_factor = float(rxtx_factor)
+        except:
+            raise exceptions.CommandError("rxtx_factor must be a float.")
+
+        try:
+            is_public = utils.bool_from_str(is_public)
+        except:
+            raise exceptions.CommandError("is_public must be a boolean.")
+
         body = {
             "flavor": {
                 "name": name,
-                "ram": int(ram),
-                "vcpus": int(vcpus),
-                "disk": int(disk),
-                "id": int(flavorid),
-                "swap": int(swap),
-                "OS-FLV-EXT-DATA:ephemeral": int(ephemeral),
-                "rxtx_factor": int(rxtx_factor),
-                "os-flavor-access:is_public": bool(is_public),
+                "ram": ram,
+                "vcpus": vcpus,
+                "disk": disk,
+                "id": flavorid,
+                "swap": swap,
+                "OS-FLV-EXT-DATA:ephemeral": ephemeral,
+                "rxtx_factor": rxtx_factor,
+                "os-flavor-access:is_public": is_public,
             }
         }
 

=== added file 'novaclient/v1_1/fping.py'
--- novaclient/v1_1/fping.py	1970-01-01 00:00:00 +0000
+++ novaclient/v1_1/fping.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,66 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 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.
+
+"""
+Fping interface.
+"""
+
+from novaclient import base
+
+
+class Fping(base.Resource):
+    """
+    A server to fping.
+    """
+    HUMAN_ID = True
+
+    def __repr__(self):
+        return "<Fping: %s>" % self.id
+
+
+class FpingManager(base.ManagerWithFind):
+    """
+    Manage :class:`Fping` resources.
+    """
+    resource_class = Fping
+
+    def list(self, all_tenants=False, include=[], exclude=[]):
+        """
+        Fping all servers.
+
+        :rtype: list of :class:`Fping`.
+        """
+        params = []
+        if all_tenants:
+            params.append("all_tenants=1")
+        if include:
+            params.append("include=%s" % ",".join(include))
+        elif exclude:
+            params.append("exclude=%s" % ",".join(exclude))
+        uri = "/os-fping"
+        if params:
+            uri = "%s?%s" % (uri, "&".join(params))
+        return self._list(uri, "servers")
+
+    def get(self, server):
+        """
+        Fping a specific server.
+
+        :param network: ID of the server to fping.
+        :rtype: :class:`Fping`
+        """
+        return self._get("/os-fping/%s" % base.getid(server), "server")

=== modified file 'novaclient/v1_1/hosts.py'
--- novaclient/v1_1/hosts.py	2012-08-16 12:41:00 +0000
+++ novaclient/v1_1/hosts.py	2012-11-30 14:02:33 +0000
@@ -62,5 +62,8 @@
         url = "/os-hosts/%s/%s" % (host, action)
         return self._get(url)
 
-    def list_all(self):
-        return self._list("/os-hosts", "hosts")
+    def list_all(self, zone=None):
+        url = '/os-hosts'
+        if zone:
+            url = '/os-hosts?zone=%s' % zone
+        return self._list(url, "hosts")

=== modified file 'novaclient/v1_1/servers.py'
--- novaclient/v1_1/servers.py	2012-09-07 18:32:24 +0000
+++ novaclient/v1_1/servers.py	2012-11-30 14:02:33 +0000
@@ -215,7 +215,18 @@
         :param image_name: The name to assign the newly create image.
         :param metadata: Metadata to assign to the image.
         """
-        self.manager.create_image(self, image_name, metadata)
+        return self.manager.create_image(self, image_name, metadata)
+
+    def backup(self, backup_name, backup_type, rotation):
+        """
+        Backup a server instance.
+
+        :param backup_name: Name of the backup image
+        :param backup_type: The backup type, like 'daily' or 'weekly'
+        :param rotation: Int parameter representing how many backups to
+                        keep around.
+        """
+        self.manager.backup(self, backup_name, backup_type, rotation)
 
     def confirm_resize(self):
         """
@@ -603,6 +614,21 @@
         image_uuid = location.split('/')[-1]
         return image_uuid
 
+    def backup(self, server, backup_name, backup_type, rotation):
+        """
+        Backup a server instance.
+
+        :param server: The :class:`Server` (or its ID) to share onto.
+        :param backup_name: Name of the backup image
+        :param backup_type: The backup type, like 'daily' or 'weekly'
+        :param rotation: Int parameter representing how many backups to
+                        keep around.
+        """
+        body = {'name': backup_name,
+                'backup_type': backup_type,
+                'rotation': rotation}
+        self._action('createBackup', server, body)
+
     def set_meta(self, server, metadata):
         """
         Set a servers metadata

=== added file 'novaclient/v1_1/services.py'
--- novaclient/v1_1/services.py	1970-01-01 00:00:00 +0000
+++ novaclient/v1_1/services.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,62 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+# 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.
+
+"""
+service interface
+"""
+from novaclient import base
+
+
+class Service(base.Resource):
+    def __repr__(self):
+        return "<Service: %s>" % self.service
+
+    def _add_details(self, info):
+        dico = 'resource' in info and info['resource'] or info
+        for (k, v) in dico.items():
+            setattr(self, k, v)
+
+
+class ServiceManager(base.ManagerWithFind):
+    resource_class = Service
+
+    def list(self, host=None, service=None):
+        """
+        Describes cpu/memory/hdd info for host.
+
+        :param host: destination host name.
+        """
+        url = "/os-services"
+        if host:
+            url = "/os-services?host=%s" % host
+        if service:
+            url = "/os-services?service=%s" % service
+        if host and service:
+            url = "/os-services?host=%s&service=%s" % (host, service)
+        return self._list(url, "services")
+
+    def enable(self, host, service):
+        """Enable the service specified by hostname and servicename"""
+        body = {"host": host, "service": service}
+        result = self._update("/os-services/enable", body)
+        return self.resource_class(self, result)
+
+    def disable(self, host, service):
+        """Enable the service specified by hostname and servicename"""
+        body = {"host": host, "service": service}
+        result = self._update("/os-services/disable", body)
+        return self.resource_class(self, result)

=== modified file 'novaclient/v1_1/shell.py'
--- novaclient/v1_1/shell.py	2012-09-27 08:59:05 +0000
+++ novaclient/v1_1/shell.py	2012-11-30 14:02:33 +0000
@@ -49,7 +49,11 @@
         raise exceptions.CommandError("you need to specify a Flavor ID ")
 
     flavor = _find_flavor(cs, args.flavor)
-    image = _find_image(cs, args.image)
+
+    if args.image:
+        image = _find_image(cs, args.image)
+    else:
+        image = None
 
     meta = dict(v.split('=', 1) for v in args.meta)
 
@@ -199,7 +203,7 @@
         metavar='<key=value>',
         help="Send arbitrary key/value pairs to the scheduler for custom use.")
 @utils.arg('--nic',
-     metavar="<net-id=net-uuid,v4-fixed-ip=ip-addr>",
+     metavar="<net-id=net-uuid,v4-fixed-ip=ip-addr,port-id=port-uuid>",
      action='append',
      dest='nics',
      default=[],
@@ -237,8 +241,11 @@
     info['flavor'] = _find_flavor(cs, flavor_id).name
 
     image = info.get('image', {})
-    image_id = image.get('id', '')
-    info['image'] = _find_image(cs, image_id).name
+    if image:
+        image_id = image.get('id', '')
+        info['image'] = _find_image(cs, image_id).name
+    else:  # Booting from volume
+        info['image'] = "Attempt to boot from volume - no image supplied"
 
     info.pop('links', None)
     info.pop('addresses', None)
@@ -262,6 +269,13 @@
     cs.cloudpipe.create(args.project)
 
 
[e-mail]('address', metavar='<ip address>', help='New IP Address.')
[e-mail]('port', metavar='<port>', help='New Port.')
+def do_cloudpipe_configure(cs, args):
+    """Create a cloudpipe instance for the given project"""
+    cs.cloudpipe.update(args.address, args.port)
+
+
 def _poll_for_status(poll_fn, obj_id, action, final_ok_states,
                      poll_period=5, show_progress=True,
                      status_field="status", silent=False):
@@ -341,9 +355,6 @@
 def do_flavor_list(cs, _args):
     """Print a list of available 'flavors' (sizes of servers)."""
     flavors = cs.flavors.list()
-    for flavor in flavors:
-        # int needed for numerical sort
-        flavor.id = int(flavor.id)
     _print_flavor_list(cs, flavors)
 
 
@@ -390,7 +401,7 @@
 @utils.arg('--rxtx-factor',
      metavar='<factor>',
      help="RX/TX factor (default 1)",
-     default=1)
+     default=1.0)
 @utils.arg('--is-public',
      metavar='<is-public>',
      help="Make flavor accessible to the public (default true)",
@@ -620,12 +631,12 @@
     dest='ip',
     metavar='<ip-regexp>',
     default=None,
-    help='Search with regular expression match by IP address')
+    help='Search with regular expression match by IP address (Admin only).')
 @utils.arg('--ip6',
     dest='ip6',
     metavar='<ip6-regexp>',
     default=None,
-    help='Search with regular expression match by IPv6 address')
+    help='Search with regular expression match by IPv6 address (Admin only).')
 @utils.arg('--name',
     dest='name',
     metavar='<name-regexp>',
@@ -635,7 +646,7 @@
     dest='instance_name',
     metavar='<name-regexp>',
     default=None,
-    help='Search with regular expression match by instance name')
+    help='Search with regular expression match by instance name (Admin only).')
 @utils.arg('--instance_name',
     help=argparse.SUPPRESS)
 @utils.arg('--status',
@@ -658,25 +669,31 @@
     dest='host',
     metavar='<hostname>',
     default=None,
-    help='Search instances by hostname to which they are assigned')
+    help='Search instances by hostname to which they are assigned '
+         '(Admin only).')
 @utils.arg('--all-tenants',
     dest='all_tenants',
     metavar='<0|1>',
     nargs='?',
     type=int,
     const=1,
-    default=0,
+    default=int(utils.bool_from_str(os.environ.get("ALL_TENANTS", 'false'))),
     help='Display information from all tenants (Admin only).')
 @utils.arg('--all_tenants',
     nargs='?',
     type=int,
     const=1,
     help=argparse.SUPPRESS)
[e-mail]('--tenant',
+    #nova db searches by project_id
+    dest='tenant',
+    metavar='<tenant>',
+    nargs='?',
+    help='Display information from single tenant (Admin only).')
 def do_list(cs, args):
     """List active servers."""
-    all_tenants = int(os.environ.get("ALL_TENANTS", args.all_tenants))
     search_opts = {
-            'all_tenants': all_tenants,
+            'all_tenants': args.all_tenants,
             'reservation_id': args.reservation_id,
             'ip': args.ip,
             'ip6': args.ip6,
@@ -684,6 +701,7 @@
             'image': args.image,
             'flavor': args.flavor,
             'status': args.status,
+            'project_id': args.tenant,
             'host': args.host,
             'instance_name': args.instance_name}
 
@@ -799,7 +817,7 @@
     default=False,
     help='Blocks while instance migrates so progress can be reported.')
 def do_migrate(cs, args):
-    """Migrate a server."""
+    """Migrate a server. The new host will be selected by the scheduler."""
     server = _find_server(cs, args.server)
     server.migrate()
 
@@ -929,6 +947,19 @@
                              show_progress=False, silent=True)
 
 
[e-mail]('server', metavar='<server>', help='Name or ID of server.')
[e-mail]('name', metavar='<name>', help='Name of the backup image.')
[e-mail]('backup_type', metavar='<backup-type>',
+           help='The backup type, like "daily" or "weekly".')
[e-mail]('rotation', metavar='<rotation>',
+           help='Int parameter representing how many backups to keep around.')
+def do_backup(cs, args):
+    """ Backup a instance by create a 'backup' type snapshot """
+    _find_server(cs, args.server).backup(args.name,
+                                         args.backup_type,
+                                         args.rotation)
+
+
 @utils.arg('server',
      metavar='<server>',
      help="Name or ID of server")
@@ -975,15 +1006,18 @@
                                       flavor_id)
 
     image = info.get('image', {})
-    image_id = image.get('id', '')
-    if args.minimal:
-        info['image'] = image_id
-    else:
-        try:
-            info['image'] = '%s (%s)' % (_find_image(cs, image_id).name,
-                                         image_id)
-        except Exception:
-            info['image'] = '%s (%s)' % ("Image not found", image_id)
+    if image:
+        image_id = image.get('id', '')
+        if args.minimal:
+            info['image'] = image_id
+        else:
+            try:
+                info['image'] = '%s (%s)' % (_find_image(cs, image_id).name,
+                                             image_id)
+            except Exception:
+                info['image'] = '%s (%s)' % ("Image not found", image_id)
+    else:  # Booted from volume
+        info['image'] = "Attempt to boot from volume - no image supplied"
 
     info.pop('links', None)
     info.pop('addresses', None)
@@ -1002,10 +1036,15 @@
     _print_server(cs, args)
 
 
[e-mail]('server', metavar='<server>', help='Name or ID of server.')
[e-mail]('server', metavar='<server>', nargs='+',
+           help='Name or ID of server(s).')
 def do_delete(cs, args):
-    """Immediately shut down and delete a server."""
-    _find_server(cs, args.server).delete()
+    """Immediately shut down and delete specified server(s)."""
+    for server in args.server:
+        try:
+            _find_server(cs, server).delete()
+        except Exception, e:
+            print e
 
 
 def _find_server(cs, server):
@@ -1080,10 +1119,24 @@
                 setattr(item, to_key, item._info[from_key])
 
 
[e-mail]('--all-tenants',
+    dest='all_tenants',
+    metavar='<0|1>',
+    nargs='?',
+    type=int,
+    const=1,
+    default=int(utils.bool_from_str(os.environ.get("ALL_TENANTS", 'false'))),
+    help='Display information from all tenants (Admin only).')
[e-mail]('--all_tenants',
+    nargs='?',
+    type=int,
+    const=1,
+    help=argparse.SUPPRESS)
 @utils.service_type('volume')
-def do_volume_list(cs, _args):
+def do_volume_list(cs, args):
     """List all the volumes."""
-    volumes = cs.volumes.list()
+    search_opts = {'all_tenants': args.all_tenants}
+    volumes = cs.volumes.list(search_opts=search_opts)
     _translate_volume_keys(volumes)
 
     # Create a list of servers to which the volume is attached
@@ -1553,7 +1606,7 @@
     nargs='?',
     type=int,
     const=1,
-    default=0,
+    default=int(utils.bool_from_str(os.environ.get("ALL_TENANTS", 'false'))),
     help='Display information from all tenants (Admin only).')
 @utils.arg('--all_tenants',
     nargs='?',
@@ -1562,8 +1615,7 @@
     help=argparse.SUPPRESS)
 def do_secgroup_list(cs, args):
     """List security groups for the current tenant."""
-    all_tenants = int(os.environ.get("ALL_TENANTS", args.all_tenants))
-    search_opts = {'all_tenants': all_tenants}
+    search_opts = {'all_tenants': args.all_tenants}
     _print_secgroups(cs.security_groups.list(search_opts=search_opts))
 
 
@@ -1849,7 +1901,7 @@
     _print_aggregate_details(aggregate)
 
 
[e-mail]('id', metavar='<id>', help='Host aggregate id to delete.')
[e-mail]('id', metavar='<id>', help='Aggregate id.')
 @utils.arg('host', metavar='<host>', help='The host to add to the aggregate.')
 def do_aggregate_add_host(cs, args):
     """Add the host to the specified aggregate."""
@@ -1858,8 +1910,9 @@
     _print_aggregate_details(aggregate)
 
 
[e-mail]('id', metavar='<id>', help='Host aggregate id to delete.')
[e-mail]('host', metavar='<host>', help='The host to add to the aggregate.')
[e-mail]('id', metavar='<id>', help='Aggregate id.')
[e-mail]('host', metavar='<host>',
+        help='The host to remove from the aggregate.')
 def do_aggregate_remove_host(cs, args):
     """Remove the specified host from the specified aggregate."""
     aggregate = cs.aggregates.remove_host(args.id, args.host)
@@ -1867,7 +1920,7 @@
     _print_aggregate_details(aggregate)
 
 
[e-mail]('id', metavar='<id>', help='Host aggregate id to delete.')
[e-mail]('id', metavar='<id>', help='Aggregate id.')
 def do_aggregate_details(cs, args):
     """Show details of the specified aggregate."""
     _print_aggregate_details(cs.aggregates.get_details(args.id))
@@ -1893,7 +1946,7 @@
     action='store_true',
     dest='disk_over_commit',
     default=False,
-    help='Allow overcommit.(Default=Flase)')
+    help='Allow overcommit.(Default=False)')
 @utils.arg('--disk_over_commit',
     action='store_true',
     help=argparse.SUPPRESS)
@@ -1914,6 +1967,52 @@
     _find_server(cs, args.server).reset_state(args.state)
 
 
[e-mail]('--host', metavar='<hostname>', default=None,
+           help='Name of host.')
[e-mail]('--servicename', metavar='<servicename>', default=None,
+           help='Name of service.')
+def do_service_list(cs, args):
+    """Show a list of all running services. Filter by host & service name."""
+    result = cs.services.list(args.host, args.servicename)
+    columns = ["Binary", "Host", "Zone", "Status", "State", "Updated_at"]
+    utils.print_list(result, columns)
+
+
[e-mail]('host', metavar='<hostname>', help='Name of host.')
[e-mail]('service', metavar='<servicename>', help='Name of service.')
+def do_service_enable(cs, args):
+    """Enable the service"""
+    result = cs.services.enable(args.host, args.service)
+    utils.print_list([result], ['Host', 'Service', 'Disabled'])
+
+
[e-mail]('host', metavar='<hostname>', help='Name of host.')
[e-mail]('service', metavar='<servicename>', help='Name of service.')
+def do_service_disable(cs, args):
+    """Enable the service"""
+    result = cs.services.disable(args.host, args.service)
+    utils.print_list([result], ['Host', 'Service', 'Disabled'])
+
+
[e-mail]('fixed_ip', metavar='<fixed_ip>', help='Fixed IP Address.')
+def do_fixed_ip_get(cs, args):
+    """Get info on a fixed ip"""
+    result = cs.fixed_ips.get(args.fixed_ip)
+    utils.print_list([result], ['address', 'cidr', 'hostname', 'host'])
+
+
[e-mail]('fixed_ip', metavar='<fixed_ip>', help='Fixed IP Address.')
+def do_fixed_ip_reserve(cs, args):
+    """Reserve a fixed ip"""
+    cs.fixed_ips.reserve(args.fixed_ip)
+
+
[e-mail]('fixed_ip', metavar='<fixed_ip>', help='Fixed IP Address.')
+def do_fixed_ip_unreserve(cs, args):
+    """Unreserve a fixed ip"""
+    cs.fixed_ips.unreserve(args.fixed_ip)
+
+
 @utils.arg('host', metavar='<hostname>', help='Name of host.')
 def do_host_describe(cs, args):
     """Describe a specific host"""
@@ -1922,10 +2021,13 @@
     utils.print_list(result, columns)
 
 
[e-mail]('--zone', metavar='<zone>', default=None,
+           help='Filters the list, returning only those '
+                'hosts in the availability zone <zone>.')
 def do_host_list(cs, args):
     """List all hosts by service"""
-    columns = ["host_name", "service"]
-    result = cs.hosts.list_all()
+    columns = ["host_name", "service", "zone"]
+    result = cs.hosts.list_all(args.zone)
     utils.print_list(result, columns)
 
 
@@ -1989,7 +2091,8 @@
     for hyper in hypers:
         hyper_host = hyper.hypervisor_hostname
         hyper_id = hyper.id
-        instances.extend([InstanceOnHyper(id=serv['uuid'],
+        if hasattr(hyper, 'servers'):
+            instances.extend([InstanceOnHyper(id=serv['uuid'],
                                           name=serv['name'],
                                           hypervisor_hostname=hyper_host,
                                           hypervisor_id=hyper_id)
@@ -2082,6 +2185,10 @@
     dest='identity',
     help='Private key file, same as the -i option to the ssh command.',
     default='')
[e-mail]('--extra-opts',
+    dest='extra',
+    help='Extra options to pass to ssh. see: man ssh',
+    default='')
 def do_ssh(cs, args):
     """SSH into a server."""
     addresses = _find_server(cs, args.server).addresses
@@ -2102,8 +2209,9 @@
     identity = '-i %s' % args.identity if len(args.identity) else ''
 
     if ip_address:
-        os.system("ssh -%d -p%d %s %s@%s" % (version, args.port, identity,
-                                             args.login, ip_address))
+        os.system("ssh -%d -p%d %s %s@%s %s" % (version, args.port, identity,
+                                                args.login, ip_address,
+                                                args.extra))
     else:
         pretty_version = "IPv%d" % version
         print "ERROR: No %s %s address found." % (address_type,
@@ -2119,7 +2227,10 @@
 def _quota_show(quotas):
     quota_dict = {}
     for resource in _quota_resources:
-        quota_dict[resource] = getattr(quotas, resource, None)
+        try:
+            quota_dict[resource] = getattr(quotas, resource)
+        except AttributeError:
+            pass
     utils.print_dict(quota_dict)
 
 
@@ -2134,22 +2245,30 @@
         manager.update(identifier, **updates)
 
 
[e-mail]('tenant',
[e-mail]('--tenant',
     metavar='<tenant-id>',
-    help='UUID of tenant to list the quotas for.')
+    default=None,
+    help='UUID or name of tenant to list the quotas for.')
 def do_quota_show(cs, args):
     """List the quotas for a tenant."""
 
-    _quota_show(cs.quotas.get(args.tenant))
-
-
[e-mail]('tenant',
+    if not args.tenant:
+        _quota_show(cs.quotas.get(cs.project_id))
+    else:
+        _quota_show(cs.quotas.get(args.tenant))
+
+
[e-mail]('--tenant',
     metavar='<tenant-id>',
-    help='UUID of tenant to list the default quotas for.')
+    default=None,
+    help='UUID or name of tenant to list the default quotas for.')
 def do_quota_defaults(cs, args):
     """List the default quotas for a tenant."""
 
-    _quota_show(cs.quotas.defaults(args.tenant))
+    if not args.tenant:
+        _quota_show(cs.quotas.defaults(cs.project_id))
+    else:
+        _quota_show(cs.quotas.defaults(args.tenant))
 
 
 @utils.arg('tenant',

=== modified file 'novaclient/v1_1/volumes.py'
--- novaclient/v1_1/volumes.py	2012-09-07 18:32:24 +0000
+++ novaclient/v1_1/volumes.py	2012-11-30 14:02:33 +0000
@@ -17,6 +17,8 @@
 Volume interface (1.1 extension).
 """
 
+import urllib
+
 from novaclient import base
 
 
@@ -76,16 +78,22 @@
         """
         return self._get("/volumes/%s" % volume_id, "volume")
 
-    def list(self, detailed=True):
+    def list(self, detailed=True, search_opts=None):
         """
         Get a list of all volumes.
 
         :rtype: list of :class:`Volume`
         """
+        search_opts = search_opts or {}
+
+        qparams = dict((k, v) for (k, v) in search_opts.iteritems() if v)
+
+        query_string = '?%s' % urllib.urlencode(qparams) if qparams else ''
+
         if detailed is True:
-            return self._list("/volumes/detail", "volumes")
+            return self._list("/volumes/detail%s" % query_string, "volumes")
         else:
-            return self._list("/volumes", "volumes")
+            return self._list("/volumes%s" % query_string, "volumes")
 
     def delete(self, volume):
         """

=== modified file 'novaclient/versioninfo'
--- novaclient/versioninfo	2012-09-27 08:59:05 +0000
+++ novaclient/versioninfo	2012-11-30 14:02:33 +0000
@@ -1,1 +1,1 @@
-2.9.0
+2.10.0

=== modified file 'python_novaclient.egg-info/PKG-INFO'
--- python_novaclient.egg-info/PKG-INFO	2012-09-27 08:59:05 +0000
+++ python_novaclient.egg-info/PKG-INFO	2012-11-30 14:02:33 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-novaclient
-Version: 2.9.0
+Version: 2.10.0
 Summary: Client library for OpenStack Nova API.
 Home-page: https://github.com/openstack/python-novaclient
 Author: Rackspace, based on work by Jacob Kaplan-Moss
@@ -269,6 +269,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_novaclient.egg-info/SOURCES.txt'
--- python_novaclient.egg-info/SOURCES.txt	2012-09-07 18:32:24 +0000
+++ python_novaclient.egg-info/SOURCES.txt	2012-11-30 14:02:33 +0000
@@ -45,11 +45,13 @@
 novaclient/v1_1/certs.py
 novaclient/v1_1/client.py
 novaclient/v1_1/cloudpipe.py
+novaclient/v1_1/fixed_ips.py
 novaclient/v1_1/flavor_access.py
 novaclient/v1_1/flavors.py
 novaclient/v1_1/floating_ip_dns.py
 novaclient/v1_1/floating_ip_pools.py
 novaclient/v1_1/floating_ips.py
+novaclient/v1_1/fping.py
 novaclient/v1_1/hosts.py
 novaclient/v1_1/hypervisors.py
 novaclient/v1_1/images.py
@@ -61,6 +63,7 @@
 novaclient/v1_1/security_group_rules.py
 novaclient/v1_1/security_groups.py
 novaclient/v1_1/servers.py
+novaclient/v1_1/services.py
 novaclient/v1_1/shell.py
 novaclient/v1_1/usage.py
 novaclient/v1_1/virtual_interfaces.py
@@ -68,6 +71,7 @@
 novaclient/v1_1/volume_types.py
 novaclient/v1_1/volumes.py
 novaclient/v1_1/contrib/__init__.py
+novaclient/v1_1/contrib/list_extensions.py
 python_novaclient.egg-info/PKG-INFO
 python_novaclient.egg-info/SOURCES.txt
 python_novaclient.egg-info/dependency_links.txt
@@ -79,6 +83,7 @@
 tests/test_auth_plugins.py
 tests/test_base.py
 tests/test_client.py
+tests/test_discover.py
 tests/test_http.py
 tests/test_service_catalog.py
 tests/test_shell.py
@@ -90,11 +95,13 @@
 tests/v1_1/test_auth.py
 tests/v1_1/test_certs.py
 tests/v1_1/test_cloudpipe.py
+tests/v1_1/test_fixed_ips.py
 tests/v1_1/test_flavor_access.py
 tests/v1_1/test_flavors.py
 tests/v1_1/test_floating_ip_dns.py
 tests/v1_1/test_floating_ip_pools.py
 tests/v1_1/test_floating_ips.py
+tests/v1_1/test_fping.py
 tests/v1_1/test_hosts.py
 tests/v1_1/test_hypervisors.py
 tests/v1_1/test_images.py
@@ -106,10 +113,13 @@
 tests/v1_1/test_security_group_rules.py
 tests/v1_1/test_security_groups.py
 tests/v1_1/test_servers.py
+tests/v1_1/test_services.py
 tests/v1_1/test_shell.py
 tests/v1_1/test_usage.py
 tests/v1_1/testfile.txt
 tests/v1_1/utils.py
+tests/v1_1/contrib/__init__.py
+tests/v1_1/contrib/test_list_extensions.py
 tools/install_venv.py
 tools/nova.bash_completion
 tools/pip-requires

=== modified file 'setup.py'
--- setup.py	2012-09-07 18:32:24 +0000
+++ setup.py	2012-11-30 14:02:33 +0000
@@ -39,6 +39,7 @@
     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_auth_plugins.py'
--- tests/test_auth_plugins.py	2012-08-16 12:41:00 +0000
+++ tests/test_auth_plugins.py	2012-11-30 14:02:33 +0000
@@ -157,3 +157,26 @@
             self.assertEquals(cs.client.auth_url, "http://faked/v2.0")
 
         test_auth_call()
+
+    def test_auth_system_raises_exception_when_missing_auth_url(self):
+        class MockAuthUrlEntrypoint(pkg_resources.EntryPoint):
+            def load(self):
+                return self.auth_url
+
+            def auth_url(self):
+                return None
+
+        def mock_iter_entry_points(_type):
+            return [MockAuthUrlEntrypoint("fakewithauthurl",
+                                          "fakewithauthurl.plugin",
+                                          ["auth_url"])]
+
+        @mock.patch.object(pkg_resources, "iter_entry_points",
+                           mock_iter_entry_points)
+        def test_auth_call():
+            with self.assertRaises(exceptions.EndpointNotFound):
+                cs = client.Client("username", "password", "project_id",
+                                   auth_system="fakewithauthurl",
+                                   no_cache=True)
+
+        test_auth_call()

=== added file 'tests/test_discover.py'
--- tests/test_discover.py	1970-01-01 00:00:00 +0000
+++ tests/test_discover.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,79 @@
+# Copyright 2012 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.
+
+import mock
+import imp
+import inspect
+import pkg_resources
+
+import novaclient.shell
+from tests import utils
+
+
+class DiscoverTest(utils.TestCase):
+
+    def test_discover_via_entry_points(self):
+
+        def mock_iter_entry_points(group):
+            if group == 'novaclient.extension':
+                fake_ep = mock.Mock()
+                fake_ep.name = 'foo'
+                fake_ep.module = imp.new_module('foo')
+                fake_ep.load.return_value = fake_ep.module
+                return [fake_ep]
+
+        @mock.patch.object(pkg_resources, 'iter_entry_points',
+                           mock_iter_entry_points)
+        def test():
+            shell = novaclient.shell.OpenStackComputeShell()
+            for name, module in shell._discover_via_entry_points():
+                self.assertEqual(name, 'foo')
+                self.assertTrue(inspect.ismodule(module))
+
+        test()
+
+    def test_discover_extensions(self):
+
+        def mock_discover_via_python_path(self):
+            yield 'foo', imp.new_module('foo')
+
+        def mock_discover_via_contrib_path(self, version):
+            yield 'bar', imp.new_module('bar')
+
+        def mock_discover_via_entry_points(self):
+            yield 'baz', imp.new_module('baz')
+
+        @mock.patch.object(novaclient.shell.OpenStackComputeShell,
+                           '_discover_via_python_path',
+                           mock_discover_via_python_path)
+        @mock.patch.object(novaclient.shell.OpenStackComputeShell,
+                           '_discover_via_contrib_path',
+                           mock_discover_via_contrib_path)
+        @mock.patch.object(novaclient.shell.OpenStackComputeShell,
+                           '_discover_via_entry_points',
+                           mock_discover_via_entry_points)
+        def test():
+            shell = novaclient.shell.OpenStackComputeShell()
+            extensions = shell._discover_extensions('1.1')
+            self.assertEqual(len(extensions), 3)
+            names = sorted(['foo', 'bar', 'baz'])
+            sorted_extensions = sorted(extensions, key=lambda ext: ext.name)
+            for i in range(len(names)):
+                ext = sorted_extensions[i]
+                name = names[i]
+                self.assertEqual(ext.name, name)
+                self.assertTrue(inspect.ismodule(ext.module))
+
+        test()

=== modified file 'tests/test_shell.py'
--- tests/test_shell.py	2012-05-24 13:30:51 +0000
+++ tests/test_shell.py	2012-11-30 14:02:33 +0000
@@ -55,10 +55,9 @@
             '(?m)^\s+root-password\s+Change the root password',
             '(?m)^See "nova 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.assertRegexpMatches(help_text, r)
 
     def test_help_on_subcommand(self):
         required = [
@@ -66,11 +65,6 @@
             '(?m)^Change the root password',
             '(?m)^Positional arguments:',
         ]
-        argstrings = [
-            'root-password --help',
-            'help root-password',
-        ]
-        for argstr in argstrings:
-            help_text = self.shell(argstr)
-            for r in required:
-                self.assertRegexpMatches(help_text, r)
+        help_text = self.shell('help root-password')
+        for r in required:
+            self.assertRegexpMatches(help_text, r)

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2012-08-16 12:41:00 +0000
+++ tests/test_utils.py	2012-11-30 14:02:33 +0000
@@ -64,10 +64,19 @@
         self.manager = FakeManager(None)
 
     def test_find_none(self):
+        """Test a few non-valid inputs"""
         self.assertRaises(exceptions.CommandError,
                           utils.find_resource,
                           self.manager,
                           'asdf')
+        self.assertRaises(exceptions.CommandError,
+                          utils.find_resource,
+                          self.manager,
+                          None)
+        self.assertRaises(exceptions.CommandError,
+                          utils.find_resource,
+                          self.manager,
+                          {})
 
     def test_find_by_integer_id(self):
         output = utils.find_resource(self.manager, 1234)

=== added directory 'tests/v1_1/contrib'
=== added file 'tests/v1_1/contrib/__init__.py'
=== added file 'tests/v1_1/contrib/test_list_extensions.py'
--- tests/v1_1/contrib/test_list_extensions.py	1970-01-01 00:00:00 +0000
+++ tests/v1_1/contrib/test_list_extensions.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,21 @@
+from novaclient import extension
+from novaclient.v1_1.contrib import list_extensions
+
+from tests import utils
+from tests.v1_1 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_1/fakes.py'
--- tests/v1_1/fakes.py	2012-09-27 08:59:05 +0000
+++ tests/v1_1/fakes.py	2012-11-30 14:02:33 +0000
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from datetime import datetime
 import httplib2
 import urlparse
 
@@ -25,7 +26,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)
 
 
@@ -68,6 +70,53 @@
             return httplib2.Response({"status": status}), body
 
     #
+    # List all extensions
+    #
+
+    def get_extensions(self, **kw):
+        exts = [
+            {
+                "alias": "NMN",
+                "description": "Multiple network support",
+                "links": [],
+                "name": "Multinic",
+                "namespace": ("http://docs.openstack.org/"
+                              "compute/ext/multinic/api/v1.1"),
+                "updated": "2011-06-09T00:00:00+00:00"
+            },
+            {
+                "alias": "OS-DCF",
+                "description": "Disk Management Extension",
+                "links": [],
+                "name": "DiskConfig",
+                "namespace": ("http://docs.openstack.org/"
+                              "compute/ext/disk_config/api/v1.1"),
+                "updated": "2011-09-27T00:00:00+00:00"
+            },
+            {
+                "alias": "OS-EXT-SRV-ATTR",
+                "description": "Extended Server Attributes support.",
+                "links": [],
+                "name": "ExtendedServerAttributes",
+                "namespace": ("http://docs.openstack.org/"
+                              "compute/ext/extended_status/api/v1.1"),
+                "updated": "2011-11-03T00:00:00+00:00"
+            },
+            {
+                "alias": "OS-EXT-STS",
+                "description": "Extended Status support",
+                "links": [],
+                "name": "ExtendedStatus",
+                "namespace": ("http://docs.openstack.org/"
+                              "compute/ext/extended_status/api/v1.1"),
+                "updated": "2011-11-03T00:00:00+00:00"
+            },
+        ]
+        return (200, {
+            "extensions": exts,
+        })
+
+    #
     # Limits
     #
 
@@ -200,6 +249,34 @@
                 "metadata": {
                     "Server Label": "DB 1"
                 }
+            },
+            {
+                "id": 9012,
+                "name": "sample-server3",
+                "image": "",
+                "flavor": {
+                    "id": 1,
+                    "name": "256 MB Server",
+                },
+                "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+                "status": "ACTIVE",
+                "addresses": {
+                    "public": [{
+                        "version": 4,
+                        "addr": "4.5.6.7",
+                    },
+                    {
+                        "version": 4,
+                        "addr": "5.6.9.8",
+                    }],
+                    "private": [{
+                        "version": 4,
+                        "addr": "10.13.12.13",
+                    }],
+                },
+                "metadata": {
+                    "Server Label": "DB 1"
+                }
             }
         ]})
 
@@ -213,6 +290,13 @@
                 fakes.assert_has_keys(pfile, required=['path', 'contents'])
         return (202, self.get_servers_1234()[1])
 
+    def post_os_volumes_boot(self, body, **kw):
+        assert set(body.keys()) <= set(['server', 'os:scheduler_hints'])
+        fakes.assert_has_keys(body['server'],
+                        required=['name', 'block_device_mapping', 'flavorRef'],
+                        optional=['imageRef'])
+        return (202, self.get_servers_9012()[1])
+
     def get_servers_1234(self, **kw):
         r = {'server': self.get_servers_detail()[1]['servers'][0]}
         return (200, r)
@@ -221,6 +305,10 @@
         r = {'server': self.get_servers_detail()[1]['servers'][1]}
         return (200, r)
 
+    def get_servers_9012(self, **kw):
+        r = {'server': self.get_servers_detail()[1]['servers'][2]}
+        return (200, r)
+
     def put_servers_1234(self, body, **kw):
         assert body.keys() == ['server']
         fakes.assert_has_keys(body['server'], optional=['name', 'adminPass'])
@@ -345,6 +433,10 @@
             assert body[action].keys() == ['name']
         elif action == 'removeSecurityGroup':
             assert body[action].keys() == ['name']
+        elif action == 'createBackup':
+            assert set(body[action].keys()) == set(['name',
+                                                    'backup_type',
+                                                    'rotation'])
         else:
             raise AssertionError("Unexpected server action: %s" % action)
         return (resp, _body)
@@ -361,6 +453,9 @@
     def post_os_cloudpipe(self, **ks):
         return (202, {'instance_id': '9d5824aa-20e6-4b9f-b967-76a699fc51fd'})
 
+    def put_os_cloudpipe_configure_project(self, **kw):
+        return (202, None)
+
     #
     # Flavors
     #
@@ -817,6 +912,48 @@
         return (202, None)
 
     #
+    # Services
+    #
+    def get_os_services(self, **kw):
+        host = kw.get('host', 'host1')
+        service = kw.get('service', 'nova-compute')
+        return (200, {'services':
+                     [{'binary': service,
+                       'host': host,
+                       'zone': 'nova',
+                       'status': 'enabled',
+                       'state': 'up',
+                       'updated_at': datetime(2012, 10, 29, 13, 42, 2)},
+                      {'binary': service,
+                       'host': host,
+                       'zone': 'nova',
+                       'status': 'disabled',
+                       'state': 'down',
+                       'updated_at': datetime(2012, 9, 18, 8, 3, 38)},
+                      ]})
+
+    def put_os_services_enable(self, body, **kw):
+        return (200, {'host': body['host'], 'service': body['service'],
+                'disabled': False})
+
+    def put_os_services_disable(self, body, **kw):
+        return (200, {'host': body['host'], 'service': body['service'],
+                'disabled': True})
+
+    #
+    # Fixed IPs
+    #
+    def get_os_fixed_ips_192_168_1_1(self, *kw):
+        return (200, {"fixed_ip":
+                      {'cidr': '192.168.1.0/24',
+                       'address': '192.168.1.1',
+                       'hostname': 'foo',
+                       'host': 'bar'}})
+
+    def post_os_fixed_ips_192_168_1_1_action(self, body, **kw):
+        return (202, None)
+
+    #
     # Hosts
     #
     def get_os_hosts_host(self, *kw):
@@ -830,6 +967,16 @@
                  {'resource': {'project': 'admin', 'host': 'dummy',
                   'cpu': 1, 'memory_mb': 2048, 'disk_gb': 30}}]})
 
+    def get_os_hosts(self, **kw):
+        zone = kw.get('zone', 'nova1')
+        return (200, {'hosts':
+                    [{'host': 'host1',
+                      'service': 'nova-compute',
+                      'zone': zone},
+                     {'host': 'host1',
+                      'service': 'nova-cert',
+                      'zone': zone}]})
+
     def get_os_hosts_sample_host(self, *kw):
         return (200, {'host': [{'resource': {'host': 'sample_host'}}], })
 
@@ -988,3 +1135,32 @@
 
     def post_os_networks_networkdisassociate_action(self, **kw):
         return (202, None)
+
+    def get_os_fping(self, **kw):
+        return (
+            200, {
+                'servers': [
+                    {
+                        "id": "1",
+                        "project_id": "fake-project",
+                        "alive": True,
+                    },
+                    {
+                        "id": "2",
+                        "project_id": "fake-project",
+                        "alive": True,
+                    },
+                ]
+            }
+        )
+
+    def get_os_fping_1(self, **kw):
+        return (
+            200, {
+                'server': {
+                    "id": "1",
+                    "project_id": "fake-project",
+                    "alive": True,
+                }
+            }
+        )

=== modified file 'tests/v1_1/test_cloudpipe.py'
--- tests/v1_1/test_cloudpipe.py	2012-04-02 11:29:59 +0000
+++ tests/v1_1/test_cloudpipe.py	2012-11-30 14:02:33 +0000
@@ -20,3 +20,9 @@
         body = {'cloudpipe': {'project_id': project}}
         cs.assert_called('POST', '/os-cloudpipe', body)
         self.assertTrue(isinstance(cp, str))
+
+    def test_update(self):
+        cs.cloudpipe.update("192.168.1.1", 2345)
+        body = {'configure_project': {'vpn_ip': "192.168.1.1",
+                                      'vpn_port': 2345}}
+        cs.assert_called('PUT', '/os-cloudpipe/configure-project', body)

=== added file 'tests/v1_1/test_fixed_ips.py'
--- tests/v1_1/test_fixed_ips.py	1970-01-01 00:00:00 +0000
+++ tests/v1_1/test_fixed_ips.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,43 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+# 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 novaclient.v1_1 import fixed_ips
+from tests.v1_1 import fakes
+from tests import utils
+
+cs = fakes.FakeClient()
+
+
+class FixedIpsTest(utils.TestCase):
+
+    def test_get_fixed_ip(self):
+        info = cs.fixed_ips.get(fixed_ip='192.168.1.1')
+        cs.assert_called('GET', '/os-fixed-ips/192.168.1.1')
+        self.assertEqual(info.cidr, '192.168.1.0/24')
+        self.assertEqual(info.address, '192.168.1.1')
+        self.assertEqual(info.hostname, 'foo')
+        self.assertEqual(info.host, 'bar')
+
+    def test_reserve_fixed_ip(self):
+        body = {"reserve": None}
+        res = cs.fixed_ips.reserve(fixed_ip='192.168.1.1')
+        cs.assert_called('POST', '/os-fixed-ips/192.168.1.1/action', body)
+
+    def test_unreserve_fixed_ip(self):
+        body = {"unreserve": None}
+        res = cs.fixed_ips.unreserve(fixed_ip='192.168.1.1')
+        cs.assert_called('POST', '/os-fixed-ips/192.168.1.1/action', body)

=== modified file 'tests/v1_1/test_flavors.py'
--- tests/v1_1/test_flavors.py	2012-09-27 08:59:05 +0000
+++ tests/v1_1/test_flavors.py	2012-11-30 14:02:33 +0000
@@ -60,7 +60,7 @@
                 "OS-FLV-EXT-DATA:ephemeral": 10,
                 "id": 1234,
                 "swap": 0,
-                "rxtx_factor": 1,
+                "rxtx_factor": 1.0,
                 "os-flavor-access:is_public": False,
             }
         }
@@ -80,7 +80,7 @@
                 "OS-FLV-EXT-DATA:ephemeral": 0,
                 "id": 1234,
                 "swap": 0,
-                "rxtx_factor": 1,
+                "rxtx_factor": 1.0,
                 "os-flavor-access:is_public": True,
             }
         }
@@ -88,6 +88,29 @@
         cs.assert_called('POST', '/flavors', body)
         self.assertTrue(isinstance(f, flavors.Flavor))
 
+    def test_invalid_parameters_create(self):
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", "invalid", 1, 10, 1234, swap=0,
+                          ephemeral=0, rxtx_factor=1.0, is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, "invalid", 10, 1234, swap=0,
+                          ephemeral=0, rxtx_factor=1.0, is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, 1, "invalid", 1234, swap=0,
+                          ephemeral=0, rxtx_factor=1.0, is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, 1, 10, 1234, swap="invalid",
+                          ephemeral=0, rxtx_factor=1.0, is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, 1, 10, 1234, swap=0,
+                          ephemeral="invalid", rxtx_factor=1.0, is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, 1, 10, 1234, swap=0,
+                          ephemeral=0, rxtx_factor="invalid", is_public=True)
+        self.assertRaises(exceptions.CommandError, cs.flavors.create,
+                          "flavorcreate", 512, 1, 10, 1234, swap=0,
+                          ephemeral=0, rxtx_factor=1.0, is_public='invalid')
+
     def test_delete(self):
         cs.flavors.delete("flavordelete")
         cs.assert_called('DELETE', '/flavors/flavordelete')

=== added file 'tests/v1_1/test_fping.py'
--- tests/v1_1/test_fping.py	1970-01-01 00:00:00 +0000
+++ tests/v1_1/test_fping.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,41 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 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 novaclient import exceptions
+from novaclient.v1_1 import fping
+from tests import utils
+from tests.v1_1 import fakes
+
+
+cs = fakes.FakeClient()
+
+
+class FpingTest(utils.TestCase):
+
+    def test_list_fpings(self):
+        fl = cs.fping.list()
+        cs.assert_called('GET', '/os-fping')
+        [self.assertTrue(isinstance(f, fping.Fping)) for f in fl]
+        [self.assertEqual(f.project_id, "fake-project") for f in fl]
+        [self.assertEqual(f.alive, True) for f in fl]
+
+    def test_get_fping(self):
+        f = cs.fping.get(1)
+        cs.assert_called('GET', '/os-fping/1')
+        self.assertTrue(isinstance(f, fping.Fping))
+        self.assertEqual(f.project_id, "fake-project")
+        self.assertEqual(f.alive, True)

=== modified file 'tests/v1_1/test_hosts.py'
--- tests/v1_1/test_hosts.py	2012-02-24 09:35:35 +0000
+++ tests/v1_1/test_hosts.py	2012-11-30 14:02:33 +0000
@@ -13,6 +13,18 @@
         cs.assert_called('GET', '/os-hosts/host')
         [self.assertTrue(isinstance(h, hosts.Host)) for h in hs]
 
+    def test_list_host(self):
+        hs = cs.hosts.list_all()
+        cs.assert_called('GET', '/os-hosts')
+        [self.assertTrue(isinstance(h, hosts.Host)) for h in hs]
+        [self.assertEqual(h.zone, 'nova1') for h in hs]
+
+    def test_list_host_with_zone(self):
+        hs = cs.hosts.list_all('nova')
+        cs.assert_called('GET', '/os-hosts?zone=nova')
+        [self.assertTrue(isinstance(h, hosts.Host)) for h in hs]
+        [self.assertEqual(h.zone, 'nova') for h in hs]
+
     def test_update_enable(self):
         host = cs.hosts.get('sample_host')[0]
         values = {"status": "enabled"}

=== modified file 'tests/v1_1/test_servers.py'
--- tests/v1_1/test_servers.py	2012-08-16 12:41:00 +0000
+++ tests/v1_1/test_servers.py	2012-11-30 14:02:33 +0000
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import StringIO
 
 from novaclient import exceptions
@@ -59,6 +61,38 @@
         cs.assert_called('POST', '/servers')
         self.assertTrue(isinstance(s, servers.Server))
 
+    def test_create_server_userdata_unicode(self):
+        s = cs.servers.create(
+            name="My server",
+            image=1,
+            flavor=1,
+            meta={'foo': 'bar'},
+            userdata=u'こんにちは',
+            key_name="fakekey",
+            files={
+                '/etc/passwd': 'some data',                 # a file
+                '/tmp/foo.txt': StringIO.StringIO('data'),   # a stream
+            },
+        )
+        cs.assert_called('POST', '/servers')
+        self.assertTrue(isinstance(s, servers.Server))
+
+    def test_create_server_userdata_utf8(self):
+        s = cs.servers.create(
+            name="My server",
+            image=1,
+            flavor=1,
+            meta={'foo': 'bar'},
+            userdata='こんにちは',
+            key_name="fakekey",
+            files={
+                '/etc/passwd': 'some data',                 # a file
+                '/tmp/foo.txt': StringIO.StringIO('data'),   # a stream
+            },
+        )
+        cs.assert_called('POST', '/servers')
+        self.assertTrue(isinstance(s, servers.Server))
+
     def test_update_server(self):
         s = cs.servers.get(1234)
 
@@ -102,7 +136,7 @@
                           flavor={"id": 1, "name": "256 MB Server"})
 
         sl = cs.servers.findall(flavor={"id": 1, "name": "256 MB Server"})
-        self.assertEqual([s.id for s in sl], [1234, 5678])
+        self.assertEqual([s.id for s in sl], [1234, 5678, 9012])
 
     def test_reboot_server(self):
         s = cs.servers.get(1234)
@@ -230,6 +264,13 @@
         cs.servers.unlock(s)
         cs.assert_called('POST', '/servers/1234/action')
 
+    def test_backup(self):
+        s = cs.servers.get(1234)
+        s.backup('back1', 'daily', 1)
+        cs.assert_called('POST', '/servers/1234/action')
+        cs.servers.backup(s, 'back1', 'daily', 2)
+        cs.assert_called('POST', '/servers/1234/action')
+
     def test_get_console_output_without_length(self):
         success = 'foo'
         s = cs.servers.get(1234)

=== added file 'tests/v1_1/test_services.py'
--- tests/v1_1/test_services.py	1970-01-01 00:00:00 +0000
+++ tests/v1_1/test_services.py	2012-11-30 14:02:33 +0000
@@ -0,0 +1,68 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+# 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 novaclient.v1_1 import services
+from tests.v1_1 import fakes
+from tests import utils
+
+
+cs = fakes.FakeClient()
+
+
+class ServicesTest(utils.TestCase):
+
+    def test_list_services(self):
+        svs = cs.services.list()
+        cs.assert_called('GET', '/os-services')
+        [self.assertTrue(isinstance(s, services.Service)) for s in svs]
+        [self.assertEqual(s.binary, 'nova-compute') for s in svs]
+        [self.assertEqual(s.host, 'host1') for s in svs]
+
+    def test_list_services_with_hostname(self):
+        svs = cs.services.list(host='host2')
+        cs.assert_called('GET', '/os-services?host=host2')
+        [self.assertTrue(isinstance(s, services.Service)) for s in svs]
+        [self.assertEqual(s.binary, 'nova-compute') for s in svs]
+        [self.assertEqual(s.host, 'host2') for s in svs]
+
+    def test_list_services_with_service(self):
+        svs = cs.services.list(service='nova-cert')
+        cs.assert_called('GET', '/os-services?service=nova-cert')
+        [self.assertTrue(isinstance(s, services.Service)) for s in svs]
+        [self.assertEqual(s.binary, 'nova-cert') for s in svs]
+        [self.assertEqual(s.host, 'host1') for s in svs]
+
+    def test_list_services_with_host_service(self):
+        svs = cs.services.list('host2', 'nova-cert')
+        cs.assert_called('GET', '/os-services?host=host2&service=nova-cert')
+        [self.assertTrue(isinstance(s, services.Service)) for s in svs]
+        [self.assertEqual(s.binary, 'nova-cert') for s in svs]
+        [self.assertEqual(s.host, 'host2') for s in svs]
+
+    def test_services_enable(self):
+        service = cs.services.enable('host1', 'nova-cert')
+        values = {"host": "host1", 'service': 'nova-cert'}
+        cs.assert_called('PUT', '/os-services/enable', values)
+        self.assertTrue(isinstance(service, services.Service))
+        self.assertFalse(service.disabled)
+
+    def test_services_disable(self):
+        service = cs.services.disable('host1', 'nova-cert')
+        values = {"host": "host1", 'service': 'nova-cert'}
+        cs.assert_called('PUT', '/os-services/disable', values)
+        self.assertTrue(isinstance(service, services.Service))
+        self.assertTrue(service.disabled)

=== modified file 'tests/v1_1/test_shell.py'
--- tests/v1_1/test_shell.py	2012-09-27 08:59:05 +0000
+++ tests/v1_1/test_shell.py	2012-11-30 14:02:33 +0000
@@ -86,6 +86,33 @@
                 }},
         )
 
+    def test_boot_no_image_no_bdms(self):
+        cmd = 'boot --flavor 1 some-server'
+        self.assertRaises(exceptions.CommandError, self.run_command, cmd)
+
+    def test_boot_no_image_bdms(self):
+        self.run_command(
+            'boot --flavor 1 --block_device_mapping vda=blah:::0 some-server'
+        )
+        self.assert_called_anytime(
+            'POST', '/os-volumes_boot',
+            {'server': {
+                'flavorRef': '1',
+                'name': 'some-server',
+                'block_device_mapping': [
+                    {
+                        'volume_size': '',
+                        'volume_id': 'blah',
+                        'delete_on_termination': '0',
+                        'device_name':'vda'
+                    }
+                ],
+                'imageRef': '',
+                'min_count': 1,
+                'max_count': 1,
+                }},
+        )
+
     def test_boot_metadata(self):
         self.run_command('boot --image 1 --flavor 1 --meta foo=bar=pants'
                          ' --meta spam=eggs some-server ')
@@ -276,6 +303,11 @@
         self.assert_called('GET', '/flavors/1', pos=-2)
         self.assert_called('GET', '/images/2')
 
+    def test_show_no_image(self):
+        self.run_command('show 9012')
+        self.assert_called('GET', '/servers/9012', pos=-2)
+        self.assert_called('GET', '/flavors/1', pos=-1)
+
     def test_show_bad_id(self):
         self.assertRaises(exceptions.CommandError,
                           self.run_command, 'show xxx')
@@ -454,6 +486,54 @@
         self.assert_called('POST', '/servers/1234/action',
                            {'os-resetState': {'state': 'active'}})
 
+    def test_services_list(self):
+        self.run_command('service-list')
+        self.assert_called('GET', '/os-services')
+
+    def test_services_list_with_host(self):
+        self.run_command('service-list --host host1')
+        self.assert_called('GET', '/os-services?host=host1')
+
+    def test_services_list_with_servicename(self):
+        self.run_command('service-list --servicename nova-cert')
+        self.assert_called('GET', '/os-services?service=nova-cert')
+
+    def test_services_list_with_host_servicename(self):
+        self.run_command('service-list --host host1 --servicename nova-cert')
+        self.assert_called('GET', '/os-services?host=host1&service=nova-cert')
+
+    def test_services_enable(self):
+        self.run_command('service-enable host1 nova-cert')
+        body = {'host': 'host1', 'service': 'nova-cert'}
+        self.assert_called('PUT', '/os-services/enable', body)
+
+    def test_services_disable(self):
+        self.run_command('service-disable host1 nova-cert')
+        body = {'host': 'host1', 'service': 'nova-cert'}
+        self.assert_called('PUT', '/os-services/disable', body)
+
+    def test_fixed_ips_get(self):
+        self.run_command('fixed-ip-get 192.168.1.1')
+        self.assert_called('GET', '/os-fixed-ips/192.168.1.1')
+
+    def test_fixed_ips_reserve(self):
+        self.run_command('fixed-ip-reserve 192.168.1.1')
+        body = {'reserve': None}
+        self.assert_called('POST', '/os-fixed-ips/192.168.1.1/action', body)
+
+    def test_fixed_ips_unreserve(self):
+        self.run_command('fixed-ip-unreserve 192.168.1.1')
+        body = {'unreserve': None}
+        self.assert_called('POST', '/os-fixed-ips/192.168.1.1/action', body)
+
+    def test_host_list(self):
+        self.run_command('host-list')
+        self.assert_called('GET', '/os-hosts')
+
+    def test_host_list_with_zone(self):
+        self.run_command('host-list --zone nova')
+        self.assert_called('GET', '/os-hosts?zone=nova')
+
     def test_host_update_status(self):
         self.run_command('host-update sample-host_1 --status enabled')
         body = {'status': 'enabled'}
@@ -507,11 +587,11 @@
         self.assert_called('GET', '/os-hypervisors/statistics')
 
     def test_quota_show(self):
-        self.run_command('quota-show test')
+        self.run_command('quota-show --tenant test')
         self.assert_called('GET', '/os-quota-sets/test')
 
     def test_quota_defaults(self):
-        self.run_command('quota-defaults test')
+        self.run_command('quota-defaults --tenant test')
         self.assert_called('GET', '/os-quota-sets/test/defaults')
 
     def test_quota_update(self):
@@ -533,3 +613,30 @@
     def test_network_show(self):
         self.run_command('network-show 1')
         self.assert_called('GET', '/os-networks/1')
+
+    def test_cloudpipe_list(self):
+        self.run_command('cloudpipe-list')
+        self.assert_called('GET', '/os-cloudpipe')
+
+    def test_cloudpipe_create(self):
+        self.run_command('cloudpipe-create myproject')
+        body = {'cloudpipe': {'project_id': "myproject"}}
+        self.assert_called('POST', '/os-cloudpipe', body)
+
+    def test_cloudpipe_configure(self):
+        self.run_command('cloudpipe-configure 192.168.1.1 1234')
+        body = {'configure_project': {'vpn_ip': "192.168.1.1",
+                                      'vpn_port': '1234'}}
+        self.assert_called('PUT', '/os-cloudpipe/configure-project', body)
+
+    def test_backup(self):
+        self.run_command('backup sample-server back1 daily 1')
+        self.assert_called('POST', '/servers/1234/action',
+                           {'createBackup': {'name': 'back1',
+                                             'backup_type': 'daily',
+                                             'rotation': '1'}})
+        self.run_command('backup 1234 back1 daily 1')
+        self.assert_called('POST', '/servers/1234/action',
+                           {'createBackup': {'name': 'back1',
+                                             'backup_type': 'daily',
+                                             'rotation': '1'}})