From 95cae99475e7a0eb549478306f56210bb2b8a597 Mon Sep 17 00:00:00 2001 From: John Griffith Date: Thu, 20 Sep 2012 17:27:13 -0600 Subject: [PATCH] Add lun number (0) to model_update in HpSanDriver The HpSanDriver was not setting the lun number in model_update and as a result default value of 1 was being used. Trouble is the Lun number used by LeftHand is 0, so the connect info would be wrong and fail when trying to attach the volume. Fixes bug #1053717 Change-Id: If82a66c6a78ab03da09223a7b79abe559a6f702f (cherry picked from commit f55198570fd59b7a2a4ddd2f5e77b3d03d0a3d64) --- cinder/tests/test_HpSanISCSIDriver.py | 2 +- cinder/volume/san.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cinder/tests/test_HpSanISCSIDriver.py b/cinder/tests/test_HpSanISCSIDriver.py index 151f0a21a..e2b802ffe 100644 --- a/cinder/tests/test_HpSanISCSIDriver.py +++ b/cinder/tests/test_HpSanISCSIDriver.py @@ -175,7 +175,7 @@ class HpSanISCSITestCase(test.TestCase): def test_create_volume(self): volume = {'name': self.volume_name, 'size': 1} model_update = self.driver.create_volume(volume) - expected_iqn = "iqn.2003-10.com.lefthandnetworks:group01:25366:fakev" + expected_iqn = "iqn.2003-10.com.lefthandnetworks:group01:25366:fakev 0" expected_location = "10.0.1.6:3260,1 %s" % expected_iqn self.assertEqual(model_update['provider_location'], expected_location) diff --git a/cinder/volume/san.py b/cinder/volume/san.py index fe98d50ca..7c06d859f 100644 --- a/cinder/volume/san.py +++ b/cinder/volume/san.py @@ -581,9 +581,12 @@ class HpSanISCSIDriver(SanISCSIDriver): iscsi_portal = cluster_vip + ":3260," + cluster_interface model_update = {} - model_update['provider_location'] = ("%s %s" % + + # NOTE(jdg): LH volumes always at lun 0 ? + model_update['provider_location'] = ("%s %s %s" % (iscsi_portal, - iscsi_iqn)) + iscsi_iqn, + 0)) return model_update -- 2.45.2