More complete image creation

2 files changed, 47 insertions, 7 deletions

diff --git a/tests/v1/test_images.py b/tests/v1/test_images.py
index 8ade8ab..1c51fab 100644
--- a/tests/v1/test_images.py
+++ b/tests/v1/test_images.py
@@ -43,12 +43,44 @@ class ImageManagerTest(unittest.TestCase):
         expect = [('DELETE', '/v1/images/1', {}, None)]
         self.assertEqual(self.api.calls, expect)
 
-    def test_create(self):
-        image = self.mgr.create(name='image-1')
-        expect = [('POST', '/v1/images', {}, {'image': {'name': 'image-1'}})]
+    def test_create_no_data(self):
+        params = {
+            'id': '1',
+            'name': 'image-1',
+            'container_format': 'ovf',
+            'disk_format': 'vhd',
+            'owner': 'asdf',
+            'size': 1024,
+            'min_ram': 512,
+            'min_disk': 10,
+            'copy_from': 'http://example.com',
+            'properties': {'a': 'b', 'c': 'd'},
+        }
+        image = self.mgr.create(**params)
+        expect_headers = {
+            'x-image-meta-id': '1',
+            'x-image-meta-name': 'image-1',
+            'x-image-meta-container_format': 'ovf',
+            'x-image-meta-disk_format': 'vhd',
+            'x-image-meta-owner': 'asdf',
+            'x-image-meta-size': '1024',
+            'x-image-meta-min_ram': '512',
+            'x-image-meta-min_disk': '10',
+            'x-glance-api-copy-from': 'http://example.com',
+            'x-image-meta-property-a': 'b',
+            'x-image-meta-property-c': 'd',
+        }
+        expect = [('POST', '/v1/images', expect_headers, None)]
         self.assertEqual(self.api.calls, expect)
         self.assertEqual(image.id, '1')
         self.assertEqual(image.name, 'image-1')
+        self.assertEqual(image.container_format, 'ovf')
+        self.assertEqual(image.disk_format, 'vhd')
+        self.assertEqual(image.owner, 'asdf')
+        self.assertEqual(image.size, '1024')
+        self.assertEqual(image.min_ram, '512')
+        self.assertEqual(image.min_disk, '10')
+        self.assertEqual(image.properties, {'a': 'b', 'c': 'd'})
 
     def test_update(self):
         image = self.mgr.update('1', name='image-2')
diff --git a/tests/v1/utils.py b/tests/v1/utils.py
index c06b075..7598aa5 100644
--- a/tests/v1/utils.py
+++ b/tests/v1/utils.py
@@ -18,11 +18,19 @@ fixtures = {
         'POST': (
             {
                 'location': '/v1/images/1',
-                'x-image-meta-id': '1',
-                'x-image-meta-name': 'image-1',
-                'x-image-meta-property-arch': 'x86_64',
             },
-            None),
+            {'image': {
+                'id': '1',
+                'name': 'image-1',
+                'container_format': 'ovf',
+                'disk_format': 'vhd',
+                'owner': 'asdf',
+                'size': '1024',
+                'min_ram': '512',
+                'min_disk': '10',
+                'properties': {'a': 'b', 'c': 'd'},
+
+            }}),
     },
     '/v1/images/detail': {
         'GET': (