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

diff --git a/cinder/volume/drivers/netapp/dataontap/fc_7mode.py b/cinder/volume/drivers/netapp/dataontap/fc_7mode.py
index 8b06e621670c09788fb4efb963e27a19e2aba8c9..a8397d7463dffb4e8632288f3675b76f158e5bc5 100644 (file)
--- 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 856d8b510480de9e17839753da585cc943e7d613..91b8591800b08e97947c2da67a9c012d7437c2c4 100644 (file)
--- 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 2a200f1cb3ab1a728b2dc5336f9ecc223b8360db..db786825ae90083c0932624f4d7ddee7a3da5f87 100644 (file)
--- 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 482d0552254e99f4e93f6d9610b64006a10beaa9..9fd7f7e0151807e6709cd2020843230913077bcf 100644 (file)
--- 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'