From: Nilesh Bhosale <nilesh.bhosale@in.ibm.com>
Date: Fri, 16 Jan 2015 10:10:18 +0000 (+0530)
Subject: Set 'driver_volume_type' to 'gpfs'
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bd2b492fff5ef709b26f94cd0eec96565721fa8c;p=openstack-build%2Fcinder-build.git

Set 'driver_volume_type' to 'gpfs'

nova LibvirtGPFSVolumeDriver class implemented recently for GPFS volume
driver expects the 'driver_volume_type' as 'gpfs' from the Cinder GPFS
driver. Making the required change in the GPFS cinder driver to
complete the fix.

Change-Id: I880b93e5e3608b63872e6937d02482a3fe368efd
Related-Bug: #1405044
---

diff --git a/cinder/tests/test_gpfs.py b/cinder/tests/test_gpfs.py
index a994fff8e..8f44d99b1 100644
--- a/cinder/tests/test_gpfs.py
+++ b/cinder/tests/test_gpfs.py
@@ -1028,6 +1028,7 @@ class GPFSDriverTestCase(test.TestCase):
         self.assertEqual(data['data']['name'], 'test')
         self.assertEqual(data['data']['device_path'], os.path.join(
             self.driver.configuration.gpfs_mount_point_base, 'test'))
+        self.assertEqual(data['driver_volume_type'], 'gpfs')
 
     def test_terminate_connection(self):
         self.assertEqual(None, self.driver.terminate_connection('', ''))
diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py
index c5732eba4..2316feaf0 100644
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@ -657,7 +657,7 @@ class GPFSDriver(driver.VolumeDriver):
 
     def initialize_connection(self, volume, connector):
         return {
-            'driver_volume_type': 'local',
+            'driver_volume_type': 'gpfs',
             'data': {
                 'name': volume['name'],
                 'device_path': self.local_path(volume),