openstack/cinder
Code Issues Proposed changes

Remove old deprecated driver mappings

Browse Source 
These have existed since 2015, which is acceptable to be removed since
it has been two or more releases.

Change-Id: I1541f85bd439cf119ab69eecbfaf96099c2ac10b
This commit is contained in:
Mike Perez 2016-10-01 10:25:19 -07:00
parent 3499070caa
commit 6ac5d02419
3 changed files with 24 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cinder/tests/unit/volume/drivers/huawei/test_huawei_drivers_compatibility.py
View File

@ -1,65 +0,0 @@
# Copyright 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import cfg
from oslo_utils import importutils
from cinder import context
from cinder import test
CONF = cfg.CONF
HUAWEI_ISCSI_MODULE = ("cinder.volume.drivers.huawei.huawei_driver."
"HuaweiISCSIDriver")
HUAWEI_FC_MODULE = ("cinder.volume.drivers.huawei.huawei_driver."
"HuaweiFCDriver")
class VolumeDriverCompatibility(test.TestCase):
"""Test backwards compatibility for volume drivers."""
def fake_update_cluster_status(self):
return
def setUp(self):
super(VolumeDriverCompatibility, self).setUp()
self.manager = importutils.import_object(CONF.volume_manager)
self.context = context.get_admin_context()
def _load_driver(self, driver):
self.manager.__init__(volume_driver=driver)
def _driver_module_name(self):
return "%s.%s" % (self.manager.driver.__class__.__module__,
self.manager.driver.__class__.__name__)
def test_huawei_driver_iscsi_old(self):
self._load_driver(
'cinder.volume.drivers.huawei.huawei_driver.'
'Huawei18000ISCSIDriver')
self.assertEqual(self._driver_module_name(), HUAWEI_ISCSI_MODULE)
def test_huawei_driver_iscsi_new(self):
self._load_driver(HUAWEI_ISCSI_MODULE)
self.assertEqual(self._driver_module_name(), HUAWEI_ISCSI_MODULE)
def test_huawei_driver_fc_old(self):
self._load_driver(
'cinder.volume.drivers.huawei.huawei_driver.Huawei18000FCDriver')
self.assertEqual(self._driver_module_name(), HUAWEI_FC_MODULE)
def test_huawei_driver_fc_new(self):
self._load_driver(HUAWEI_FC_MODULE)
self.assertEqual(self._driver_module_name(), HUAWEI_FC_MODULE)

16
cinder/volume/manager.py
View File

@ -139,14 +139,6 @@ CONF = cfg.CONF
CONF.register_opts(volume_manager_opts)
MAPPING = {
'cinder.volume.drivers.huawei.huawei_18000.Huawei18000ISCSIDriver':
'cinder.volume.drivers.huawei.huawei_driver.HuaweiISCSIDriver',
'cinder.volume.drivers.huawei.huawei_driver.Huawei18000ISCSIDriver':
'cinder.volume.drivers.huawei.huawei_driver.HuaweiISCSIDriver',
'cinder.volume.drivers.huawei.huawei_18000.Huawei18000FCDriver':
'cinder.volume.drivers.huawei.huawei_driver.HuaweiFCDriver',
'cinder.volume.drivers.huawei.huawei_driver.Huawei18000FCDriver':
'cinder.volume.drivers.huawei.huawei_driver.HuaweiFCDriver',
'cinder.volume.drivers.hds.nfs.HDSNFSDriver':
'cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver',
'cinder.volume.drivers.hds.iscsi.HDSISCSIDriver':
@ -155,14 +147,6 @@ MAPPING = {
'cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver',
'cinder.volume.drivers.hitachi.hnas_iscsi.HDSISCSIDriver':
'cinder.volume.drivers.hitachi.hnas_iscsi.HNASISCSIDriver',
'cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver':
'cinder.volume.drivers.hpe.hpe_3par_fc.HPE3PARFCDriver',
'cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver':
'cinder.volume.drivers.hpe.hpe_3par_iscsi.HPE3PARISCSIDriver',
'cinder.volume.drivers.san.hp.hp_lefthand_iscsi.HPLeftHandISCSIDriver':
'cinder.volume.drivers.hpe.hpe_lefthand_iscsi.HPELeftHandISCSIDriver',
'cinder.volume.drivers.san.hp.hp_xp_fc.HPXPFCDriver':
'cinder.volume.drivers.hpe.hpe_xp_fc.HPEXPFCDriver',
'cinder.volume.drivers.ibm.xiv_ds8k':
'cinder.volume.drivers.ibm.ibm_storage',
}

24
releasenotes/notes/remove-deprecated-driver-mappings-b927d8ef9fc3b713.yaml Normal file
View File

@ -0,0 +1,24 @@
---
upgrade:
- |
Old driver paths have been removed since they have been through our alloted
deprecation period. Make sure if you have any of these paths being set in
your cinder.conf for the volume_driver option, to update to the new driver
path listed here.
* Old path - cinder.volume.drivers.huawei.huawei_18000.Huawei18000ISCSIDriver
* New path - cinder.volume.drivers.huawei.huawei_driver.HuaweiISCSIDriver
* Old path - cinder.volume.drivers.huawei.huawei_driver.Huawei18000ISCSIDriver
* New path - cinder.volume.drivers.huawei.huawei_driver.HuaweiISCSIDriver
* Old path - cinder.volume.drivers.huawei.huawei_18000.Huawei18000FCDriver
* New path - cinder.volume.drivers.huawei.huawei_driver.HuaweiFCDriver
* Old path - cinder.volume.drivers.huawei.huawei_driver.Huawei18000FCDriver
* New path - cinder.volume.drivers.huawei.huawei_driver.HuaweiFCDriver
* Old path - cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver
* New path - cinder.volume.drivers.hpe.hpe_3par_fc.HPE3PARFCDriver
* Old path - cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver
* New path - cinder.volume.drivers.hpe.hpe_3par_iscsi.HPE3PARISCSIDriver
* Old path - cinder.volume.drivers.san.hp.hp_lefthand_iscsi.HPLeftHandISCSIDriver
* New path - cinder.volume.drivers.hpe.hpe_lefthand_iscsi.HPELeftHandISCSIDriver
* Old path - cinder.volume.drivers.san.hp.hp_xp_fc.HPXPFCDriver
* New path - cinder.volume.drivers.hpe.hpe_xp_fc.HPEXPFCDriver