Rename SolidFire driver for consistency

Rename driver to SolidFireDriver for consistency.

Fixes: bug #1136081
Change-Id: I83aef90706474e8a079ab5247b72b33c7a2c8472

diff --git a/cinder/tests/test_drivers_compatibility.py b/cinder/tests/test_drivers_compatibility.py
index e6cb6c550759f6af5ea8bb7991d92e069eb208d5..9781a1a341d2e5cc375a3bb705718e59dce5cc9e 100644 (file)
--- a/cinder/tests/test_drivers_compatibility.py
+++ b/cinder/tests/test_drivers_compatibility.py
@@ -18,7 +18,7 @@ from oslo.config import cfg
 from cinder import context
 from cinder.openstack.common import importutils
 from cinder import test
-from cinder.volume.drivers.solidfire import SolidFire
+from cinder.volume.drivers.solidfire import SolidFireDriver
 
 
 CONF = cfg.CONF
@@ -30,7 +30,7 @@ SAN_MODULE = "cinder.volume.drivers.san.san.SanISCSIDriver"
 SOLARIS_MODULE = "cinder.volume.drivers.san.solaris.SolarisISCSIDriver"
 LEFTHAND_MODULE = "cinder.volume.drivers.san.hp_lefthand.HpSanISCSIDriver"
 NFS_MODULE = "cinder.volume.drivers.nfs.NfsDriver"
-SOLIDFIRE_MODULE = "cinder.volume.drivers.solidfire.SolidFire"
+SOLIDFIRE_MODULE = "cinder.volume.drivers.solidfire.SolidFireDriver"
 STORWIZE_SVC_MODULE = "cinder.volume.drivers.storwize_svc.StorwizeSVCDriver"
 WINDOWS_MODULE = "cinder.volume.drivers.windows.WindowsDriver"
 XIV_MODULE = "cinder.volume.drivers.xiv.XIVDriver"
@@ -54,7 +54,7 @@ class VolumeDriverCompatibility(test.TestCase):
     def _load_driver(self, driver):
         if 'SolidFire' in driver:
             # SolidFire driver does update_cluster stat on init
-            self.stubs.Set(SolidFire, '_update_cluster_status',
+            self.stubs.Set(SolidFireDriver, '_update_cluster_status',
                            self.fake_update_cluster_status)
         self.manager.__init__(volume_driver=driver)
 
@@ -122,6 +122,10 @@ class VolumeDriverCompatibility(test.TestCase):
         self._load_driver('cinder.volume.solidfire.SolidFire')
         self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE)
 
+    def test_solidfire_old2(self):
+        self._load_driver('cinder.volume.drivers.solidfire.SolidFire')
+        self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE)
+
     def test_solidfire_new(self):
         self._load_driver(SOLIDFIRE_MODULE)
         self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE)

diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py
index 71f3b0d7eee6daae5f9bb3651316fb2644c0718d..f57c8515a3ffed2f9481f6d29488773acd245ac0 100644 (file)
--- a/cinder/tests/test_solidfire.py
+++ b/cinder/tests/test_solidfire.py
@@ -21,7 +21,7 @@ from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.volume import configuration as conf
-from cinder.volume.drivers.solidfire import SolidFire
+from cinder.volume.drivers.solidfire import SolidFireDriver
 
 LOG = logging.getLogger(__name__)
 
@@ -43,7 +43,7 @@ class SolidFireVolumeTestCase(test.TestCase):
         self.configuration.sf_account_prefix = 'cinder'
 
         super(SolidFireVolumeTestCase, self).setUp()
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
 
     def fake_issue_api_request(obj, method, params, version='1.0'):
@@ -135,9 +135,9 @@ class SolidFireVolumeTestCase(test.TestCase):
         return
 
     def test_create_with_qos_type(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
-        self.stubs.Set(SolidFire, '_set_qos_by_volume_type',
+        self.stubs.Set(SolidFireDriver, '_set_qos_by_volume_type',
                        self.fake_set_qos_by_volume_type)
         testvol = {'project_id': 'testprjid',
                    'name': 'testvol',
@@ -145,25 +145,25 @@ class SolidFireVolumeTestCase(test.TestCase):
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66',
                    'volume_type_id': 'fast'}
 
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         model_update = sfv.create_volume(testvol)
         self.assertNotEqual(model_update, None)
 
     def test_create_volume(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'testvol',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66',
                    'volume_type_id': None}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         model_update = sfv.create_volume(testvol)
         self.assertNotEqual(model_update, None)
         self.assertEqual(model_update.get('provider_geometry', None), None)
 
     def test_create_volume_non_512(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'testvol',
@@ -171,7 +171,7 @@ class SolidFireVolumeTestCase(test.TestCase):
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66',
                    'volume_type_id': None}
         self.configuration.sf_emulate_512 = False
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         model_update = sfv.create_volume(testvol)
         self.assertEqual(model_update.get('provider_geometry', None),
                          '4096 4096')
@@ -192,7 +192,7 @@ class SolidFireVolumeTestCase(test.TestCase):
                    'provider_geometry': '4096 4096'
                    }
 
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         properties = sfv.initialize_connection(testvol, connector)
         self.assertEqual(properties['data']['physical_block_size'], '4096')
         self.assertEqual(properties['data']['logical_block_size'], '4096')
@@ -200,7 +200,7 @@ class SolidFireVolumeTestCase(test.TestCase):
     def test_create_volume_with_qos(self):
         preset_qos = {}
         preset_qos['qos'] = 'fast'
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
 
         testvol = {'project_id': 'testprjid',
@@ -210,22 +210,22 @@ class SolidFireVolumeTestCase(test.TestCase):
                    'metadata': [preset_qos],
                    'volume_type_id': None}
 
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         model_update = sfv.create_volume(testvol)
         self.assertNotEqual(model_update, None)
 
     def test_create_volume_fails(self):
         # NOTE(JDG) This test just fakes update_cluster_status
         # this is inentional for this test
-        self.stubs.Set(SolidFire, '_update_cluster_status',
+        self.stubs.Set(SolidFireDriver, '_update_cluster_status',
                        self.fake_update_cluster_status)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
         testvol = {'project_id': 'testprjid',
                    'name': 'testvol',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         try:
             sfv.create_volume(testvol)
             self.fail("Should have thrown Error")
@@ -233,51 +233,51 @@ class SolidFireVolumeTestCase(test.TestCase):
             pass
 
     def test_create_sfaccount(self):
-        sfv = SolidFire(configuration=self.configuration)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        sfv = SolidFireDriver(configuration=self.configuration)
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         account = sfv._create_sfaccount('project-id')
         self.assertNotEqual(account, None)
 
     def test_create_sfaccount_fails(self):
-        sfv = SolidFire(configuration=self.configuration)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        sfv = SolidFireDriver(configuration=self.configuration)
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
         account = sfv._create_sfaccount('project-id')
         self.assertEqual(account, None)
 
     def test_get_sfaccount_by_name(self):
-        sfv = SolidFire(configuration=self.configuration)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        sfv = SolidFireDriver(configuration=self.configuration)
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         account = sfv._get_sfaccount_by_name('some-name')
         self.assertNotEqual(account, None)
 
     def test_get_sfaccount_by_name_fails(self):
-        sfv = SolidFire(configuration=self.configuration)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        sfv = SolidFireDriver(configuration=self.configuration)
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
         account = sfv._get_sfaccount_by_name('some-name')
         self.assertEqual(account, None)
 
     def test_delete_volume(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'test_volume',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         sfv.delete_volume(testvol)
 
     def test_delete_volume_fails_no_volume(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'no-name',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         try:
             sfv.delete_volume(testvol)
             self.fail("Should have thrown Error")
@@ -287,54 +287,54 @@ class SolidFireVolumeTestCase(test.TestCase):
     def test_delete_volume_fails_account_lookup(self):
         # NOTE(JDG) This test just fakes update_cluster_status
         # this is inentional for this test
-        self.stubs.Set(SolidFire, '_update_cluster_status',
+        self.stubs.Set(SolidFireDriver, '_update_cluster_status',
                        self.fake_update_cluster_status)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
         testvol = {'project_id': 'testprjid',
                    'name': 'no-name',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         self.assertRaises(exception.SfAccountNotFound,
                           sfv.delete_volume,
                           testvol)
 
     def test_get_cluster_info(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         sfv._get_cluster_info()
 
     def test_get_cluster_info_fail(self):
         # NOTE(JDG) This test just fakes update_cluster_status
         # this is inentional for this test
-        self.stubs.Set(SolidFire, '_update_cluster_status',
+        self.stubs.Set(SolidFireDriver, '_update_cluster_status',
                        self.fake_update_cluster_status)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         self.assertRaises(exception.SolidFireAPIException,
                           sfv._get_cluster_info)
 
     def test_extend_volume(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'test_volume',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         sfv.extend_volume(testvol, 2)
 
     def test_extend_volume_fails_no_volume(self):
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request)
         testvol = {'project_id': 'testprjid',
                    'name': 'no-name',
                    'size': 1,
                    'id': 'not-found'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         self.assertRaises(exception.VolumeNotFound,
                           sfv.extend_volume,
                           testvol, 2)
@@ -342,15 +342,15 @@ class SolidFireVolumeTestCase(test.TestCase):
     def test_extend_volume_fails_account_lookup(self):
         # NOTE(JDG) This test just fakes update_cluster_status
         # this is intentional for this test
-        self.stubs.Set(SolidFire, '_update_cluster_status',
+        self.stubs.Set(SolidFireDriver, '_update_cluster_status',
                        self.fake_update_cluster_status)
-        self.stubs.Set(SolidFire, '_issue_api_request',
+        self.stubs.Set(SolidFireDriver, '_issue_api_request',
                        self.fake_issue_api_request_fails)
         testvol = {'project_id': 'testprjid',
                    'name': 'no-name',
                    'size': 1,
                    'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66'}
-        sfv = SolidFire(configuration=self.configuration)
+        sfv = SolidFireDriver(configuration=self.configuration)
         self.assertRaises(exception.SfAccountNotFound,
                           sfv.extend_volume,
                           testvol, 2)

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index b35d37ac286e19f5e99f09b75fe98cfa8bc310d5..d114108a779a39a36a38bc09e8dfaf0ac1f56cb4 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -54,7 +54,7 @@ CONF = cfg.CONF
 CONF.register_opts(sf_opts)
 
 
-class SolidFire(SanISCSIDriver):
+class SolidFireDriver(SanISCSIDriver):
     """OpenStack driver to enable SolidFire cluster.
 
     Version history:
@@ -83,7 +83,7 @@ class SolidFire(SanISCSIDriver):
     GB = math.pow(2, 30)
 
     def __init__(self, *args, **kwargs):
-            super(SolidFire, self).__init__(*args, **kwargs)
+            super(SolidFireDriver, self).__init__(*args, **kwargs)
             self.configuration.append_config_values(sf_opts)
             try:
                 self._update_cluster_status()

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 7c8500797a9df73d769bc281d47b74fa0bc1d5e9..f975e6033c5e239ef58509161627cf927d8cdf55 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -86,7 +86,9 @@ MAPPING = {
     'cinder.volume.nfs.NfsDriver':
     'cinder.volume.drivers.nfs.NfsDriver',
     'cinder.volume.solidfire.SolidFire':
-    'cinder.volume.drivers.solidfire.SolidFire',
+    'cinder.volume.drivers.solidfire.SolidFireDriver',
+    'cinder.volume.drivers.solidfire.SolidFire':
+    'cinder.volume.drivers.solidfire.SolidFireDriver',
     'cinder.volume.storwize_svc.StorwizeSVCDriver':
     'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver',
     'cinder.volume.windows.WindowsDriver':