From: John Griffith <john.griffith@solidfire.com>
Date: Thu, 7 Jun 2012 20:38:29 +0000 (-0600)
Subject: Fix volume['id'] from integer to string
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f8c9b20b2dd31d8501d26111bde4107df8bb42e7;p=openstack-build%2Fcinder-build.git

Fix volume['id'] from integer to string

* This is the same fix as nova bug 1010200
* Missed in volume uuid migration

Change-Id: Ib433ea6a1f247aad7fcba72680fd14e82387ed62
---

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 5e640bd8b..54709e1a2 100644
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -268,7 +268,7 @@ class ISCSIDriver(VolumeDriver):
                                                            volume['id'])
         except exception.NotFound:
             LOG.info(_("Skipping ensure_export. No iscsi_target "
-                       "provisioned for volume: %d"), volume['id'])
+                       "provisioned for volume: %s"), volume['id'])
             return
 
         iscsi_name = "%s%s" % (FLAGS.iscsi_target_prefix, volume['name'])
@@ -316,7 +316,7 @@ class ISCSIDriver(VolumeDriver):
                                                            volume['id'])
         except exception.NotFound:
             LOG.info(_("Skipping remove_export. No iscsi_target "
-                       "provisioned for volume: %d"), volume['id'])
+                       "provisioned for volume: %s"), volume['id'])
             return
 
         try:
@@ -325,7 +325,7 @@ class ISCSIDriver(VolumeDriver):
             self.tgtadm.show_target(iscsi_target)
         except Exception as e:
             LOG.info(_("Skipping remove_export. No iscsi_target "
-                       "is presently exported for volume: %d"), volume['id'])
+                       "is presently exported for volume: %s"), volume['id'])
             return
 
         self.tgtadm.delete_logicalunit(iscsi_target, 0)