diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index ff1aa073a51..64ce03513e3 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -1845,21 +1845,6 @@ class BaseVD(object): pass -class LocalVD(object): - """This class has been deprecated and should not be inherited.""" - pass - - -class SnapshotVD(object): - """This class has been deprecated and should not be inherited.""" - pass - - -class ConsistencyGroupVD(object): - """This class has been deprecated and should not be inherited.""" - pass - - @six.add_metaclass(abc.ABCMeta) class CloneableImageVD(object): @abc.abstractmethod @@ -1908,16 +1893,6 @@ class MigrateVD(object): return (False, None) -class ExtendVD(object): - """This class has been deprecated and should not be inherited.""" - pass - - -class TransferVD(object): - """This class has been deprecated and should not be inherited.""" - pass - - @six.add_metaclass(abc.ABCMeta) class ManageableVD(object): @abc.abstractmethod diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py index 8044a9e29cb..d7e9d576e00 100644 --- a/cinder/volume/drivers/nfs.py +++ b/cinder/volume/drivers/nfs.py @@ -32,7 +32,6 @@ from cinder.image import image_utils from cinder import interface from cinder import utils from cinder.volume import configuration -from cinder.volume import driver from cinder.volume.drivers import remotefs VERSION = '1.4.0' @@ -76,7 +75,7 @@ CONF.register_opts(nfs_opts, group=configuration.SHARED_CONF_GROUP) @interface.volumedriver -class NfsDriver(remotefs.RemoteFSSnapDriverDistributed, driver.ExtendVD): +class NfsDriver(remotefs.RemoteFSSnapDriverDistributed): """NFS based cinder driver. Creates file on NFS share for using it as block device on hypervisor.