Merge lp:~rcarrillocruz/nova/lp681417 into lp:~hudson-openstack/nova/trunk

[Ricardo Carrillo Cruz]

Fixes https://bugs.launchpad.net/nova/+bug/681417

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Thierry Carrez (ttx)]

You'll have to add yourself to ./Authors in the branch before it can get merged.

review: Needs Fixing

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Ricardo Carrillo Cruz (rcarrillocruz)]

Hi Thierry

I just did and updated the lp branch, you might want to merge now.
I also added myself in the wiki, with the echosign number.

> You'll have to add yourself to ./Authors in the branch before it can get
> merged.

[Thierry Carrez (ttx)]

Hey Ricardo,

Another branch was recently merged to trunk that changes about the same lines, so a conflict was generated. You need to merge back trunk into your branch and solve the conflict.

Cheers,

review: Needs Fixing

[Ricardo Carrillo Cruz (rcarrillocruz)]

Hey Tierry

We should be good now, fixed the conflict, commited and pushed.

Regards

[Thierry Carrez (ttx)]

Looks good, thanks !

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~rcc/nova/lp681417 into lp:nova failed. Below is the output from the failed tests.

AdminAPITest
    test_admin_disabled ok
    test_admin_enabled ok
APITest
    test_exceptions_are_converted_to_faults ok
Test
    test_authorize_token ok
    test_authorize_user ok
    test_bad_token ok
    test_bad_user ok
    test_no_user ok
    test_token_expiry ok
TestLimiter
    test_authorize_token ok
TestFaults
    test_fault_parts ok
    test_raise ok
    test_retry_header ok
FlavorsTest
    test_get_flavor_by_id ok
    test_get_flavor_list ok
GlanceImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
ImageControllerWithGlanceServiceTest
    test_get_image_details ok
    test_get_image_index ok
LocalImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
LimiterTest
    test_minute ok
    test_one_per_period ok
    test_second ok
    test_users_get_separate_buckets ok
    test_we_can_go_indefinitely_if_we_spread_out_requests ok
WSGIAppProxyTest
    test_200 ok
    test_403 ok
    test_failure ok
WSGIAppTest
    test_escaping ok
    test_good_urls ok
    test_invalid_methods ok
    test_invalid_urls ok
    test_response_to_delays ok
ServersTest
    test_create_backup_schedules ok
    test_create_instance ok
    test_delete_backup_schedules ok
    test_delete_server_instance ok
    test_get_all_server_details ok
    test_get_se...

[Thierry Carrez (ttx)]

You got caught by the pep8 police, please fix the pep8 violation :)

review: Needs Fixing

[Soren Hansen (soren)]

Bexar GammaFreeze has kicked in, deferred to Cactus. Setting to "Work in Progress" to clear the review queue. Feel free to set back to "Needs Review" once Cactus opens up (of if this issue gets promoted to a release critical one).

review: Needs Resubmitting

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'Authors'
--- Authors	2011-01-27 17:56:54 +0000
+++ Authors	2011-02-04 11:06:12 +0000
@@ -41,6 +41,7 @@
 Muneyuki Noguchi <[e-mail]>
 Nachi Ueno <[e-mail]> <[e-mail]> <[e-mail]> <nova@u4>
 Paul Voccio <[e-mail]>
+Ricardo Carrillo Cruz <[e-mail]>
 Rick Clark <[e-mail]>
 Rick Harris <[e-mail]>
 Rob Kost <[e-mail]>

=== modified file 'nova/volume/api.py'
--- nova/volume/api.py	2011-01-19 02:00:28 +0000
+++ nova/volume/api.py	2011-02-04 11:06:12 +0000
@@ -45,7 +45,7 @@
             LOG.warn(_("Quota exceeeded for %(pid)s, tried to create"
                     " %(size)sG volume") % locals())
             raise quota.QuotaError(_("Volume quota exceeded. You cannot "
-                    "create a volume of size %s") % size)
+                                     "create a volume of size %sG") % size)
 
         options = {
             'size': size,