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

diff --git a/cinder/volume/solidfire.py b/cinder/volume/solidfire.py
index 70fbcab870ad95a23df07a3c5fd03062a8b650c4..d386c3313c2c2791108c0461a88b3e3e5ee4550f 100644 (file)
--- 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 = {}