From 81c8c3ab19d838e14c528753854340a8a4b4f66a Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 14 Nov 2011 16:19:48 -0800
Subject: Fixing image create in S3ImageService

Fixes bug 890486

Change-Id: I80b7fc1952acf8d6bc0eaa4fc5fffe8d097a043c
---
 nova/image/s3.py            | 13 +++++++------
 nova/tests/image/test_s3.py |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nova/image/s3.py b/nova/image/s3.py
index 6f07b5f72..f8c1d71f1 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -211,15 +211,16 @@ class S3ImageService(object):
         properties['project_id'] = context.project_id
         properties['architecture'] = arch
 
+        def _translate_dependent_image_id(image_key, image_id):
+            image_id = ec2utils.ec2_id_to_id(image_id)
+            image_uuid = self.get_image_uuid(context, image_id)
+            properties['image_id'] = image_uuid
+
         if kernel_id:
-            kernel_id = ec2_utils.ec2_id_to_id(kernel_id)
-            kernel_uuid = self._get_image_uuid(context, kernel_id)
-            properties['kernel_id'] = kernel_uuid
+            _translate_dependent_image_id('kernel_id', kernel_id)
 
         if ramdisk_id:
-            ramdisk_id = ec2utils.ec2_id_to_id(ramdisk_id)
-            ramdisk_uuid = self._get_image_uuid(context, ramdisk_id)
-            properties['ramdisk_id'] = ramdisk_uuid
+            _translate_dependent_image_id('ramdisk_id', ramdisk_id)
 
         if mappings:
             properties['mappings'] = mappings
diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py
index fbd2738f8..455ae923b 100644
--- a/nova/tests/image/test_s3.py
+++ b/nova/tests/image/test_s3.py
@@ -50,6 +50,8 @@ ami_manifest_xml = """<?xml version="1.0" ?>
                                 <device>sda3</device>
                         </mapping>
                 </block_device_mapping>
+                <kernel_id>aki-00000001</kernel_id>
+                <ramdisk_id>ari-00000001</ramdisk_id>
         </machine_configuration>
 </manifest>
 """
-- 
cgit