Merge lp:~dan-prince/nova/fix_image_id_s3 into lp:~hudson-openstack/nova/trunk

[Sandy Walsh]

Fixes a stupid mistake I made when I moved this method from a module into a class.

Thanks Dan for spotting it.

[Sandy Walsh (sandy-walsh)]

lgtm

review: Approve

[Ryan Lucio (rlucio)]

The fix looks correct and works for me on my bzr623 based deployment.

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~dan-prince/nova/fix_image_id_s3 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
 ...

[lp:~dan-prince/nova/fix_image_id_s3]

625. By Dan Prince on 2011-01-26

Add dan.prince to Authors.

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'Authors'
--- Authors	2011-01-26 00:09:08 +0000
+++ Authors	2011-01-26 23:41:42 +0000
@@ -8,6 +8,7 @@
 Chris Behrens <[e-mail]>
 Cory Wright <[e-mail]>
 David Pravec <[e-mail]>
+Dan Prince <[e-mail]>
 Dean Troyer <[e-mail]>
 Devin Carlen <[e-mail]>
 Ed Leafe <[e-mail]>

=== modified file 'nova/image/s3.py'
--- nova/image/s3.py	2011-01-25 21:06:05 +0000
+++ nova/image/s3.py	2011-01-26 23:41:42 +0000
@@ -65,7 +65,7 @@
                                  'image_id': image_id}))
         return image_id
 
-    def _fix_image_id(images):
+    def _fix_image_id(self, images):
         """S3 has imageId but OpenStack wants id"""
         for image in images:
             if 'imageId' in image:
@@ -79,7 +79,7 @@
         response = self._conn(context).make_request(
             method='GET',
             bucket='_images')
-        return _fix_image_id(json.loads(response.read()))
+        return self._fix_image_id(json.loads(response.read()))
 
     def show(self, context, image_id):
         """return a image object if the context has permissions"""