openstack
/
cinder
Code Issues Proposed changes

Remove inheritance from deprecated classes 

The following classes are deprecated and should not be inherited
(according to the class docstrings):
* LocalVD
* SnapshotVD
* ConsistencyGroupVD
* ExtendVD
* TransferVD

Change-Id: Ia9098eb4d48ed34552c9e7dee44ccadd90b0833a
This commit is contained in:
Arnon Yaari 2017-01-09 12:12:32 +02:00
parent a7e898b882
commit 6458931789
24 changed files with 27 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/volume/driver.py
View File

@ -2188,9 +2188,8 @@ class ManageableSnapshotsVD(object):
pass
class VolumeDriver(ConsistencyGroupVD, TransferVD, ManageableVD,
ExtendVD, CloneableImageVD, ManageableSnapshotsVD,
SnapshotVD, LocalVD, MigrateVD, BaseVD):
class VolumeDriver(ManageableVD, CloneableImageVD, ManageableSnapshotsVD,
MigrateVD, BaseVD):
def check_for_setup_error(self):
raise NotImplementedError()

4
cinder/volume/drivers/block_device.py
View File

@ -45,8 +45,8 @@ CONF.register_opts(volume_opts)
@interface.volumedriver
class BlockDeviceDriver(driver.BaseVD, driver.LocalVD,
driver.CloneableImageVD, driver.TransferVD):
class BlockDeviceDriver(driver.BaseVD,
driver.CloneableImageVD):
VERSION = '2.3.0'
# ThirdPartySystems wiki page

6
cinder/volume/drivers/dell/dell_storagecenter_common.py
View File

@ -73,9 +73,9 @@ CONF = cfg.CONF
CONF.register_opts(common_opts)
class DellCommonDriver(driver.ConsistencyGroupVD, driver.ManageableVD,
driver.ExtendVD, driver.ManageableSnapshotsVD,
driver.SnapshotVD, driver.BaseVD):
class DellCommonDriver(driver.ManageableVD,
driver.ManageableSnapshotsVD,
driver.BaseVD):
def __init__(self, *args, **kwargs):
super(DellCommonDriver, self).__init__(*args, **kwargs)

5
cinder/volume/drivers/dell_emc/unity/driver.py
View File

@ -38,10 +38,7 @@ CONF.register_opts(UNITY_OPTS)
@interface.volumedriver
class UnityDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.SnapshotVD,
class UnityDriver(driver.ManageableVD,
driver.ManageableSnapshotsVD,
driver.BaseVD):
"""Unity Driver.

6
cinder/volume/drivers/dell_emc/vnx/driver.py
View File

@ -28,13 +28,9 @@ LOG = logging.getLogger(__name__)
@interface.volumedriver
class VNXDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.SnapshotVD,
class VNXDriver(driver.ManageableVD,
driver.ManageableSnapshotsVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.BaseVD):
"""Dell EMC Cinder Driver for VNX using CLI.

6
cinder/volume/drivers/hpe/hpe_3par_fc.py
View File

@ -53,13 +53,9 @@ EXISTENT_PATH = 73
@interface.volumedriver
class HPE3PARFCDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.SnapshotVD,
class HPE3PARFCDriver(driver.ManageableVD,
driver.ManageableSnapshotsVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.BaseVD):
"""OpenStack Fibre Channel driver to enable 3PAR storage array.

6
cinder/volume/drivers/hpe/hpe_3par_iscsi.py
View File

@ -57,13 +57,9 @@ CHAP_PASS_KEY = "HPQ-cinder-CHAP-secret"
@interface.volumedriver
class HPE3PARISCSIDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.SnapshotVD,
class HPE3PARISCSIDriver(driver.ManageableVD,
driver.ManageableSnapshotsVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.BaseVD):
"""OpenStack iSCSI driver to enable 3PAR storage array.

3
cinder/volume/drivers/ibm/flashsystem_common.py
View File

@ -65,9 +65,6 @@ CONF.register_opts(flashsystem_opts)
class FlashSystemDriver(san.SanDriver,
driver.ManageableVD,
driver.TransferVD,
driver.ExtendVD,
driver.SnapshotVD,
driver.BaseVD):
"""IBM FlashSystem volume driver.

4
cinder/volume/drivers/ibm/gpfs.py
View File

@ -107,9 +107,7 @@ def _sizestr(size_in_g):
@interface.volumedriver
class GPFSDriver(driver.ConsistencyGroupVD, driver.ExtendVD,
driver.LocalVD, driver.TransferVD,
driver.CloneableImageVD, driver.SnapshotVD,
class GPFSDriver(driver.CloneableImageVD,
driver.MigrateVD,
driver.BaseVD):
"""Implements volume functions using GPFS primitives.

6
cinder/volume/drivers/ibm/ibm_storage.py
View File

@ -60,12 +60,8 @@ LOG = logging.getLogger(__name__)
@interface.volumedriver
class IBMStorageDriver(san.SanDriver,
driver.ManageableVD,
driver.ExtendVD,
driver.SnapshotVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.CloneableImageVD,
driver.TransferVD):
driver.CloneableImageVD):
"""IBM Storage driver
IBM Storage driver is a unified Volume driver for IBM XIV, Spectrum

5
cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
View File

@ -1875,11 +1875,8 @@ class CLIResponse(object):
class StorwizeSVCCommonDriver(san.SanDriver,
driver.ManageableVD,
driver.ExtendVD, driver.SnapshotVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.CloneableImageVD,
driver.TransferVD):
driver.CloneableImageVD):
"""IBM Storwize V7000 SVC abstract base class for iSCSI/FC volume drivers.
Version history:

6
cinder/volume/drivers/infinidat.py
View File

@ -29,7 +29,6 @@ from cinder import exception
from cinder.i18n import _
from cinder import interface
from cinder import utils
from cinder.volume import driver
from cinder.volume.drivers.san import san
from cinder.volume import utils as vol_utils
from cinder.zonemanager import utils as fczm_utils
@ -50,10 +49,7 @@ CONF.register_opts(infinidat_opts)
@interface.volumedriver
class InfiniboxVolumeDriver(san.SanDriver,
driver.ExtendVD,
driver.SnapshotVD,
driver.TransferVD):
class InfiniboxVolumeDriver(san.SanDriver):
VERSION = '1.0'
# ThirdPartySystems wiki page

6
cinder/volume/drivers/netapp/dataontap/fc_7mode.py
View File

@ -24,11 +24,7 @@ from cinder.zonemanager import utils as fczm_utils
@interface.volumedriver
class NetApp7modeFibreChannelDriver(driver.BaseVD,
driver.ConsistencyGroupVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD):
driver.ManageableVD):
"""NetApp 7-mode FibreChannel volume driver."""
DRIVER_NAME = 'NetApp_FibreChannel_7mode_direct'

6
cinder/volume/drivers/netapp/dataontap/fc_cmode.py
View File

@ -24,11 +24,7 @@ from cinder.zonemanager import utils as fczm_utils
@interface.volumedriver
class NetAppCmodeFibreChannelDriver(driver.BaseVD,
driver.ConsistencyGroupVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD):
driver.ManageableVD):
"""NetApp C-mode FibreChannel volume driver."""
DRIVER_NAME = 'NetApp_FibreChannel_Cluster_direct'

6
cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py
View File

@ -23,11 +23,7 @@ from cinder.volume.drivers.netapp.dataontap import block_7mode
@interface.volumedriver
class NetApp7modeISCSIDriver(driver.BaseVD,
driver.ConsistencyGroupVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD):
driver.ManageableVD):
"""NetApp 7-mode iSCSI volume driver."""
DRIVER_NAME = 'NetApp_iSCSI_7mode_direct'

6
cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py
View File

@ -23,11 +23,7 @@ from cinder.volume.drivers.netapp.dataontap import block_cmode
@interface.volumedriver
class NetAppCmodeISCSIDriver(driver.BaseVD,
driver.ConsistencyGroupVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD):
driver.ManageableVD):
"""NetApp C-mode iSCSI volume driver."""
DRIVER_NAME = 'NetApp_iSCSI_Cluster_direct'

1
cinder/volume/drivers/netapp/dataontap/nfs_base.py
View File

@ -56,7 +56,6 @@ HOUSEKEEPING_INTERVAL_SECONDS = 600 # ten minutes
@six.add_metaclass(utils.TraceWrapperWithABCMetaclass)
class NetAppNfsDriver(driver.ManageableVD,
driver.CloneableImageVD,
driver.SnapshotVD,
nfs.NfsDriver):
"""Base class for NetApp NFS driver for Data ONTAP."""

6
cinder/volume/drivers/netapp/eseries/fc_driver.py
View File

@ -25,11 +25,7 @@ from cinder.zonemanager import utils as fczm_utils
@interface.volumedriver
class NetAppEseriesFibreChannelDriver(driver.BaseVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD,
driver.ConsistencyGroupVD):
driver.ManageableVD):
"""NetApp E-Series FibreChannel volume driver."""
DRIVER_NAME = 'NetApp_FibreChannel_ESeries'

6
cinder/volume/drivers/netapp/eseries/iscsi_driver.py
View File

@ -26,11 +26,7 @@ from cinder.volume.drivers.netapp import utils as na_utils
@interface.volumedriver
class NetAppEseriesISCSIDriver(driver.BaseVD,
driver.ManageableVD,
driver.ExtendVD,
driver.TransferVD,
driver.SnapshotVD,
driver.ConsistencyGroupVD):
driver.ManageableVD):
"""NetApp E-Series iSCSI volume driver."""
DRIVER_NAME = 'NetApp_iSCSI_ESeries'

3
cinder/volume/drivers/nfs.py
View File

@ -29,7 +29,6 @@ from cinder.i18n import _, _LE, _LI, _LW
from cinder.image import image_utils
from cinder import interface
from cinder import utils
from cinder.volume import driver
from cinder.volume.drivers import remotefs
VERSION = '1.3.1'
@ -65,7 +64,7 @@ CONF.register_opts(nfs_opts)
@interface.volumedriver
class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
class NfsDriver(remotefs.RemoteFSDriver):
"""NFS based cinder driver.
Creates file on NFS share for using it as block device on hypervisor.

5
cinder/volume/drivers/prophetstor/dplcommon.py
View File

@ -697,9 +697,8 @@ class DPLVolume(object):
[http_client.OK, http_client.ACCEPTED])
class DPLCOMMONDriver(driver.ConsistencyGroupVD, driver.ExtendVD,
driver.CloneableImageVD,
driver.SnapshotVD, driver.LocalVD, driver.BaseVD):
class DPLCOMMONDriver(driver.CloneableImageVD,
driver.BaseVD):
"""Class of dpl storage adapter."""
VERSION = '2.0.4'

3
cinder/volume/drivers/rbd.py
View File

@ -164,8 +164,7 @@ class RADOSClient(object):
@interface.volumedriver
class RBDDriver(driver.TransferVD, driver.ExtendVD,
driver.CloneableImageVD, driver.SnapshotVD,
class RBDDriver(driver.CloneableImageVD,
driver.MigrateVD, driver.ManageableVD, driver.BaseVD):
"""Implements RADOS block device (RBD) volume commands."""

4
cinder/volume/drivers/remotefs.py
View File

@ -133,7 +133,7 @@ def locked_volume_id_operation(f, external=False):
return lvo_inner1
class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD):
class RemoteFSDriver(driver.BaseVD):
"""Common base for drivers that work like NFS."""
driver_volume_type = None
@ -628,7 +628,7 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD):
return nas_option
class RemoteFSSnapDriverBase(RemoteFSDriver, driver.SnapshotVD):
class RemoteFSSnapDriverBase(RemoteFSDriver):
"""Base class for remotefs drivers implementing qcow2 snapshots.
Driver must implement:

1
cinder/volume/drivers/tintri.py
View File

@ -69,7 +69,6 @@ CONF.register_opts(tintri_opts)
@interface.volumedriver
class TintriDriver(driver.ManageableVD,
driver.CloneableImageVD,
driver.SnapshotVD,
nfs.NfsDriver):
"""Base class for Tintri driver.