Remove old driver mapping deprecation

This deprecation was introduced back in Grizzly, which will be EOL after
IceHouse. Removing to clean things up.

Change-Id: I509bb4115c3c88a7af7326125feb760f20847b8d

diff --git a/cinder/tests/test_drivers_compatibility.py b/cinder/tests/test_drivers_compatibility.py
index fd12168d31e3f7cd497d9897822b60fdc0c93d46..84f2fc7e8e343637ecbb0d78f2ba72553e3a527c 100644 (file)
--- a/cinder/tests/test_drivers_compatibility.py
+++ b/cinder/tests/test_drivers_compatibility.py
@@ -23,17 +23,11 @@ from cinder.volume.drivers.solidfire import SolidFireDriver
 
 CONF = cfg.CONF
 
-RBD_MODULE = "cinder.volume.drivers.rbd.RBDDriver"
-SHEEPDOG_MODULE = "cinder.volume.drivers.sheepdog.SheepdogDriver"
 NEXENTA_MODULE = "cinder.volume.drivers.nexenta.iscsi.NexentaISCSIDriver"
-SAN_MODULE = "cinder.volume.drivers.san.san.SanISCSIDriver"
-SOLARIS_MODULE = "cinder.volume.drivers.san.solaris.SolarisISCSIDriver"
-NFS_MODULE = "cinder.volume.drivers.nfs.NfsDriver"
 SOLIDFIRE_MODULE = "cinder.volume.drivers.solidfire.SolidFireDriver"
 STORWIZE_MODULE = "cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver"
 WINDOWS_MODULE = "cinder.volume.drivers.windows.windows.WindowsDriver"
 XIV_DS8K_MODULE = "cinder.volume.drivers.ibm.xiv_ds8k.XIVDS8KDriver"
-ZADARA_MODULE = "cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver"
 NETAPP_MODULE = "cinder.volume.drivers.netapp.common.Deprecated"
 LEFTHAND_REST_MODULE = ("cinder.volume.drivers.san.hp.hp_lefthand_iscsi."
                         "HPLeftHandISCSIDriver")
@@ -64,56 +58,16 @@ class VolumeDriverCompatibility(test.TestCase):
         return "%s.%s" % (self.manager.driver.__class__.__module__,
                           self.manager.driver.__class__.__name__)
 
-    def test_rbd_old(self):
-        self._load_driver('cinder.volume.driver.RBDDriver')
-        self.assertEqual(self._driver_module_name(), RBD_MODULE)
-
-    def test_rbd_new(self):
-        self._load_driver(RBD_MODULE)
-        self.assertEqual(self._driver_module_name(), RBD_MODULE)
-
-    def test_sheepdog_old(self):
-        self._load_driver('cinder.volume.driver.SheepdogDriver')
-        self.assertEqual(self._driver_module_name(), SHEEPDOG_MODULE)
-
-    def test_sheepdog_new(self):
-        self._load_driver(SHEEPDOG_MODULE)
-        self.assertEqual(self._driver_module_name(), SHEEPDOG_MODULE)
-
     def test_nexenta_old(self):
-        self._load_driver('cinder.volume.nexenta.volume.NexentaDriver')
+        self._load_driver('cinder.volume.drivers.nexenta.volume.NexentaDriver')
         self.assertEqual(self._driver_module_name(), NEXENTA_MODULE)
 
     def test_nexenta_new(self):
         self._load_driver(NEXENTA_MODULE)
         self.assertEqual(self._driver_module_name(), NEXENTA_MODULE)
 
-    def test_san_old(self):
-        self._load_driver('cinder.volume.san.SanISCSIDriver')
-        self.assertEqual(self._driver_module_name(), SAN_MODULE)
-
-    def test_san_new(self):
-        self._load_driver(SAN_MODULE)
-        self.assertEqual(self._driver_module_name(), SAN_MODULE)
-
-    def test_solaris_old(self):
-        self._load_driver('cinder.volume.san.SolarisISCSIDriver')
-        self.assertEqual(self._driver_module_name(), SOLARIS_MODULE)
-
-    def test_solaris_new(self):
-        self._load_driver(SOLARIS_MODULE)
-        self.assertEqual(self._driver_module_name(), SOLARIS_MODULE)
-
-    def test_nfs_old(self):
-        self._load_driver('cinder.volume.nfs.NfsDriver')
-        self.assertEqual(self._driver_module_name(), NFS_MODULE)
-
-    def test_nfs_new(self):
-        self._load_driver(NFS_MODULE)
-        self.assertEqual(self._driver_module_name(), NFS_MODULE)
-
     def test_solidfire_old(self):
-        self._load_driver('cinder.volume.solidfire.SolidFire')
+        self._load_driver('cinder.volume.drivers.solidfire.SolidFire')
         self.assertEqual(self._driver_module_name(), SOLIDFIRE_MODULE)
 
     def test_solidfire_old2(self):
@@ -125,7 +79,8 @@ class VolumeDriverCompatibility(test.TestCase):
         self.assertEqual(self._driver_module_name(), SOLIDFIRE_MODULE)
 
     def test_storwize_svc_old(self):
-        self._load_driver('cinder.volume.storwize_svc.StorwizeSVCDriver')
+        self._load_driver(
+            'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver')
         self.assertEqual(self._driver_module_name(), STORWIZE_MODULE)
 
     def test_storwize_svc_old2(self):
@@ -138,7 +93,7 @@ class VolumeDriverCompatibility(test.TestCase):
         self.assertEqual(self._driver_module_name(), STORWIZE_MODULE)
 
     def test_windows_old(self):
-        self._load_driver('cinder.volume.windows.WindowsDriver')
+        self._load_driver('cinder.volume.drivers.windows.WindowsDriver')
         self.assertEqual(self._driver_module_name(), WINDOWS_MODULE)
 
     def test_windows_new(self):
@@ -146,41 +101,21 @@ class VolumeDriverCompatibility(test.TestCase):
         self.assertEqual(self._driver_module_name(), WINDOWS_MODULE)
 
     def test_xiv_old(self):
-        self._load_driver('cinder.volume.xiv.XIVDriver')
+        self._load_driver('cinder.volume.drivers.xiv.XIVDriver')
         self.assertEqual(self._driver_module_name(), XIV_DS8K_MODULE)
 
     def test_xiv_ds8k_new(self):
         self._load_driver(XIV_DS8K_MODULE)
         self.assertEqual(self._driver_module_name(), XIV_DS8K_MODULE)
 
-    def test_zadara_old(self):
-        self._load_driver('cinder.volume.zadara.ZadaraVPSAISCSIDriver')
-        self.assertEqual(self._driver_module_name(), ZADARA_MODULE)
-
-    def test_zadara_new(self):
-        self._load_driver(ZADARA_MODULE)
-        self.assertEqual(self._driver_module_name(), ZADARA_MODULE)
-
     def test_netapp_7m_iscsi_old(self):
-        self._load_driver(
-            'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver')
-        self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
-
-    def test_netapp_7m_iscsi_old_old(self):
-        self._load_driver('cinder.volume.netapp.NetAppISCSIDriver')
-        self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
-
-    def test_netapp_cm_iscsi_old_old(self):
-        self._load_driver('cinder.volume.netapp.NetAppCmodeISCSIDriver')
+        self._load_driver('cinder.volume.drivers.netapp.iscsi.'
+                          'NetAppISCSIDriver')
         self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
 
     def test_netapp_cm_iscsi_old(self):
-        self._load_driver(
-            'cinder.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver')
-        self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
-
-    def test_netapp_7m_nfs_old_old(self):
-        self._load_driver('cinder.volume.netapp_nfs.NetAppNFSDriver')
+        self._load_driver('cinder.volume.drivers.netapp.iscsi.'
+                          'NetAppCmodeISCSIDriver')
         self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
 
     def test_netapp_7m_nfs_old(self):
@@ -188,8 +123,8 @@ class VolumeDriverCompatibility(test.TestCase):
         self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
 
     def test_netapp_cm_nfs_old(self):
-        self._load_driver(
-            'cinder.volume.drivers.netapp.nfs.NetAppCmodeNfsDriver')
+        self._load_driver('cinder.volume.drivers.netapp.nfs.'
+                          'NetAppCmodeNfsDriver')
         self.assertEqual(self._driver_module_name(), NETAPP_MODULE)
 
     def test_hp_lefthand_rest_old(self):

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 3a96c58176f55c4834e4efbd68a0ba60afbf7c41..6ea225bb8b826f6cfa9f1ae23965d3c9fe6f7d78 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -83,51 +83,24 @@ CONF = cfg.CONF
 CONF.register_opts(volume_manager_opts)
 
 MAPPING = {
-    'cinder.volume.driver.RBDDriver': 'cinder.volume.drivers.rbd.RBDDriver',
-    'cinder.volume.driver.SheepdogDriver':
-    'cinder.volume.drivers.sheepdog.SheepdogDriver',
-    'cinder.volume.nexenta.volume.NexentaDriver':
-    'cinder.volume.drivers.nexenta.iscsi.NexentaISCSIDriver',
     'cinder.volume.drivers.nexenta.volume.NexentaDriver':
     'cinder.volume.drivers.nexenta.iscsi.NexentaISCSIDriver',
-    'cinder.volume.san.SanISCSIDriver':
-    'cinder.volume.drivers.san.san.SanISCSIDriver',
-    'cinder.volume.san.SolarisISCSIDriver':
-    'cinder.volume.drivers.san.solaris.SolarisISCSIDriver',
-    'cinder.volume.nfs.NfsDriver':
-    'cinder.volume.drivers.nfs.NfsDriver',
-    'cinder.volume.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.ibm.storwize_svc.StorwizeSVCDriver',
     'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver':
     'cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver',
-    'cinder.volume.windows.WindowsDriver':
-    'cinder.volume.drivers.windows.windows.WindowsDriver',
     'cinder.volume.drivers.windows.WindowsDriver':
     'cinder.volume.drivers.windows.windows.WindowsDriver',
-    'cinder.volume.xiv.XIVDriver':
-    'cinder.volume.drivers.ibm.xiv_ds8k.XIVDS8KDriver',
     'cinder.volume.drivers.xiv.XIVDriver':
     'cinder.volume.drivers.ibm.xiv_ds8k.XIVDS8KDriver',
     'cinder.volume.drivers.xiv_ds8k.XIVDS8KDriver':
     'cinder.volume.drivers.ibm.xiv_ds8k.XIVDS8KDriver',
-    'cinder.volume.zadara.ZadaraVPSAISCSIDriver':
-    'cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver',
     'cinder.volume.driver.ISCSIDriver':
     'cinder.volume.drivers.lvm.LVMISCSIDriver',
-    'cinder.volume.netapp.NetAppISCSIDriver':
-    'cinder.volume.drivers.netapp.common.Deprecated',
     'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver':
     'cinder.volume.drivers.netapp.common.Deprecated',
-    'cinder.volume.netapp.NetAppCmodeISCSIDriver':
-    'cinder.volume.drivers.netapp.common.Deprecated',
     'cinder.volume.drivers.netapp.iscsi.NetAppCmodeISCSIDriver':
     'cinder.volume.drivers.netapp.common.Deprecated',
-    'cinder.volume.netapp_nfs.NetAppNFSDriver':
-    'cinder.volume.drivers.netapp.common.Deprecated',
     'cinder.volume.drivers.netapp.nfs.NetAppNFSDriver':
     'cinder.volume.drivers.netapp.common.Deprecated',
     'cinder.volume.drivers.netapp.nfs.NetAppCmodeNfsDriver':