Display owner in ec2 describe images

* use owner field from glance * remove unneccessary project_id field in s3 registration * fixes bug 798998 Change-Id: I8d88ff258b914899212d63a7d31d83722d0cb559
openstack · Mar 10, 2012 · a6ac8af · a6ac8af
1 parent 6f67c9d
commit a6ac8af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
@@ -1392,7 +1392,7 @@ def _format_image(self, image):
         ramdisk_id = image['properties'].get('ramdisk_id')
         if ramdisk_id:
             i['ramdiskId'] = ec2utils.image_ec2_id(ramdisk_id, 'ari')
-        i['imageOwnerId'] = image['properties'].get('owner_id')
+        i['imageOwnerId'] = image.get('owner')
 
         img_loc = image['properties'].get('image_location')
         if img_loc:

diff --git a/nova/image/s3.py b/nova/image/s3.py
@@ -238,7 +238,6 @@ def _s3_parse_manifest(self, context, metadata, manifest):
             mappings = []
 
         properties = metadata['properties']
-        properties['project_id'] = context.project_id
         properties['architecture'] = arch
 
         def _translate_dependent_image_id(image_key, image_id):

diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
@@ -1236,14 +1236,15 @@ def test_format_image(self):
             'id': 1,
             'container_format': 'ami',
             'name': 'name',
+            'owner': 'someone',
             'properties': {
                 'image_location': 'location',
                 'kernel_id': 1,
                 'ramdisk_id': 1,
                 'type': 'machine'},
             'is_public': False}
         expected = {'name': 'name',
-                    'imageOwnerId': None,
+                    'imageOwnerId': 'someone',
                     'isPublic': False,
                     'imageId': 'ami-00000001',
                     'imageState': None,