Adds missing 'owner' attribute to image.

Fixes bug 1018216. Change-Id: I5540e0b8ab1df1904778e3edc250369b0930987e
openstack · Jun 27, 2012 · 8c1eee1 · 8c1eee1
1 parent ec99e30
commit 8c1eee1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/nova/image/glance.py b/nova/image/glance.py
@@ -452,7 +452,7 @@ def _convert_to_string(metadata):
 
 
 def _limit_attributes(image_meta):
-    IMAGE_ATTRIBUTES = ['size', 'disk_format',
+    IMAGE_ATTRIBUTES = ['size', 'disk_format', 'owner',
                         'container_format', 'checksum', 'id',
                         'name', 'created_at', 'updated_at',
                         'deleted_at', 'deleted', 'status',

diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
@@ -134,6 +134,7 @@ def test_create_with_instance_id(self):
             'deleted': None,
             'status': None,
             'properties': {'instance_id': '42', 'user_id': 'fake'},
+            'owner': None,
         }
         self.assertDictMatch(image_meta, expected)
 
@@ -165,6 +166,7 @@ def test_create_without_instance_id(self):
             'deleted': None,
             'status': None,
             'properties': {},
+            'owner': None,
         }
         actual = self.service.show(self.context, image_id)
         self.assertDictMatch(actual, expected)
@@ -318,7 +320,8 @@ def test_detail_marker(self):
                 'created_at': self.NOW_DATETIME,
                 'updated_at': self.NOW_DATETIME,
                 'deleted_at': None,
-                'deleted': None
+                'deleted': None,
+                'owner': None,
             }
 
             self.assertDictMatch(meta, expected)
@@ -362,7 +365,8 @@ def test_detail_marker_and_limit(self):
                 'created_at': self.NOW_DATETIME,
                 'updated_at': self.NOW_DATETIME,
                 'deleted_at': None,
-                'deleted': None
+                'deleted': None,
+                'owner': None,
             }
             self.assertDictMatch(meta, expected)
             i = i + 1
@@ -455,6 +459,7 @@ def test_show_passes_through_to_client(self):
             'deleted': None,
             'status': None,
             'properties': {},
+            'owner': None,
         }
         self.assertEqual(image_meta, expected)
 
@@ -501,6 +506,7 @@ def test_detail_passes_through_to_client(self):
                 'deleted': None,
                 'status': None,
                 'properties': {},
+                'owner': None,
             },
         ]
         self.assertEqual(image_metas, expected)