From 29bcb128985aa2520f9c2a3143efa9550bd86c47 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Sat, 20 Jun 2015 05:15:37 -0400 Subject: [PATCH] Port NetApp DATAONTAP blocks drivers to ABC model This commit modifies the NetApp DATAONTAP iSCSI and FibreChannel volume drivers to the new ABC driver model. Change-Id: I1a75c0e10ec5a241068cf4c28199a57da7fc2974 Partially-implements: blueprint abc-driver-update --- cinder/volume/drivers/netapp/dataontap/fc_7mode.py | 7 ++++++- cinder/volume/drivers/netapp/dataontap/fc_cmode.py | 7 ++++++- cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py | 7 ++++++- cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/cinder/volume/drivers/netapp/dataontap/fc_7mode.py b/cinder/volume/drivers/netapp/dataontap/fc_7mode.py index 8b06e6216..a8397d746 100644 --- a/cinder/volume/drivers/netapp/dataontap/fc_7mode.py +++ b/cinder/volume/drivers/netapp/dataontap/fc_7mode.py @@ -25,7 +25,12 @@ from cinder.zonemanager import utils as fczm_utils LOG = logging.getLogger(__name__) -class NetApp7modeFibreChannelDriver(driver.FibreChannelDriver): +class NetApp7modeFibreChannelDriver(driver.BaseVD, + driver.ManageableVD, + driver.ExtendVD, + driver.CloneableVD, + driver.TransferVD, + driver.SnapshotVD): """NetApp 7-mode FibreChannel volume driver.""" DRIVER_NAME = 'NetApp_FibreChannel_7mode_direct' diff --git a/cinder/volume/drivers/netapp/dataontap/fc_cmode.py b/cinder/volume/drivers/netapp/dataontap/fc_cmode.py index 856d8b510..91b859180 100644 --- a/cinder/volume/drivers/netapp/dataontap/fc_cmode.py +++ b/cinder/volume/drivers/netapp/dataontap/fc_cmode.py @@ -25,7 +25,12 @@ from cinder.zonemanager import utils as fczm_utils LOG = logging.getLogger(__name__) -class NetAppCmodeFibreChannelDriver(driver.FibreChannelDriver): +class NetAppCmodeFibreChannelDriver(driver.BaseVD, + driver.ManageableVD, + driver.ExtendVD, + driver.CloneableVD, + driver.TransferVD, + driver.SnapshotVD): """NetApp C-mode FibreChannel volume driver.""" DRIVER_NAME = 'NetApp_FibreChannel_Cluster_direct' diff --git a/cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py b/cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py index 2a200f1cb..db786825a 100644 --- a/cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py +++ b/cinder/volume/drivers/netapp/dataontap/iscsi_7mode.py @@ -24,7 +24,12 @@ from cinder.volume.drivers.netapp.dataontap import block_7mode LOG = logging.getLogger(__name__) -class NetApp7modeISCSIDriver(driver.ISCSIDriver): +class NetApp7modeISCSIDriver(driver.BaseVD, + driver.ManageableVD, + driver.ExtendVD, + driver.CloneableVD, + driver.TransferVD, + driver.SnapshotVD): """NetApp 7-mode iSCSI volume driver.""" DRIVER_NAME = 'NetApp_iSCSI_7mode_direct' diff --git a/cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py b/cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py index 482d05522..9fd7f7e01 100644 --- a/cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py +++ b/cinder/volume/drivers/netapp/dataontap/iscsi_cmode.py @@ -24,7 +24,12 @@ from cinder.volume.drivers.netapp.dataontap import block_cmode LOG = logging.getLogger(__name__) -class NetAppCmodeISCSIDriver(driver.ISCSIDriver): +class NetAppCmodeISCSIDriver(driver.BaseVD, + driver.ManageableVD, + driver.ExtendVD, + driver.CloneableVD, + driver.TransferVD, + driver.SnapshotVD): """NetApp C-mode iSCSI volume driver.""" DRIVER_NAME = 'NetApp_iSCSI_Cluster_direct' -- 2.45.2