From 60608360e0e052492a4352df015c177e6483bec0 Mon Sep 17 00:00:00 2001
From: John Griffith <john.griffith@solidfire.com>
Date: Sat, 8 Sep 2012 10:40:55 -0600
Subject: [PATCH] Recent changes to SolidFire API changed iqn format

 The SF API initially didn't supply the in prefix so we
 formed it manually in the OpenStack driver.

 This has been fixed in the API so we dropped the manual
 build of the prefix in volume create.  Unfortunatly missed
 the same case needed in create-from-snapshot.

 Going forward we're adding running integration tests against
 SF to catch this sort of thing.

Change-Id: I7107537d586f0a7c457dcbabfc90e1bc081d28d2
---
 cinder/volume/solidfire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cinder/volume/solidfire.py b/cinder/volume/solidfire.py
index 70fbcab87..d386c3313 100644
--- a/cinder/volume/solidfire.py
+++ b/cinder/volume/solidfire.py
@@ -409,7 +409,7 @@ class SolidFire(SanISCSIDriver):
         iqn = None
         for v in volume_list:
             if v['volumeID'] == volume_id:
-                iqn = 'iqn.2010-01.com.solidfire:' + v['iqn']
+                iqn = v['iqn']
                 break
 
         model_update = {}
-- 
2.45.2