From 31e481667db8b98442f69b478b8aa4a18437b191 Mon Sep 17 00:00:00 2001
From: john-griffith <john.griffith@solidfire.com>
Date: Thu, 31 Jan 2013 22:38:51 -0700
Subject: [PATCH] Fix the generalized copy_image_to_volume operation.

The Generis iSCSI copy volume<->image patch
(change: Iff097629bcce9154829a7eb5aee0ea6302338b26) did
not account for the fact that the existing volume reference
passed in to the copy method would not have the updated
provider_location and iSCSI info available.

To address this, we simply just get a new ref from the DB
after creation if a copy image is requested.

Also, the list of acceptable formats was not fully inclusive,
not only that, but there's no reason to not let the qemu-convert
handle any errors here.

Change-Id: I7b1910080d285562c7f2d8afa7f65768b1089b73
---
 cinder/volume/api.py     | 18 ------------------
 cinder/volume/manager.py |  4 ++++
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 0bba3a33602..30f6c8450f3 100644
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -144,14 +144,6 @@ class API(base.Base):
             if image_size_in_gb > size:
                 msg = _('Size of specified image is larger than volume size.')
                 raise exception.InvalidInput(reason=msg)
-            #We use qemu-img to convert images to raw and so we can only
-            #support the intersection of what qemu-img and glance support
-            if (image_meta['container_format'] != 'bare' or
-                image_meta['disk_format'] not in ['raw', 'qcow2',
-                                                  'vmdk', 'vdi']):
-                msg = (_("Image format must be one of raw, qcow2, "
-                         "vmdk, or vdi."))
-                raise exception.InvalidInput(reason=msg)
 
         try:
             reservations = QUOTAS.reserve(context, volumes=1, gigabytes=size)
@@ -600,16 +592,6 @@ class API(base.Base):
         """Create a new image from the specified volume."""
         self._check_volume_availability(context, volume, force)
 
-        #We use qemu-img to convert raw images to the requested type
-        #and so we can only support the intersection of what qemu-img and
-        #glance support
-        if (metadata['container_format'] != 'bare' or
-                metadata['disk_format'] not in ['raw', 'qcow2',
-                                                'vmdk', 'vdi']):
-            msg = (_("Image format must be one of raw, qcow2, "
-                     "vmdk, or vdi."))
-            raise exception.InvalidInput(reason=msg)
-
         recv_metadata = self.image_service.create(context, metadata)
         self.update(context, volume, {'status': 'uploading'})
         self.volume_rpcapi.copy_volume_to_image(context,
diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 65667b51896..40dfafe0393 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -221,6 +221,10 @@ class VolumeManager(manager.SchedulerDependentManager):
         self._reset_stats()
 
         if image_id and not cloned:
+            # NOTE(jdg): Our current ref hasn't been updated since
+            # the create, need to update ref to get provider_location
+            # before trying to perform the copy operation
+            volume_ref = self.db.volume_get(context, volume_id)
             if image_meta:
                 # Copy all of the Glance image properties to the
                 # volume_glance_metadata table for future reference.