openstack/cinder
Code Issues Proposed changes

Port 3PAR drivers to use ABCMeta driver model

Browse Source 
Use new ABCMeta driver model for 3PAR drivers.

Change-Id: I51051afbe9aa6135a34dfb927ed0153482810187
Implements: blueprint abc-driver-update
This commit is contained in:
Kurt Martin 2015-08-20 08:37:19 -07:00
parent a8d98325e3
commit 3094d13aa3
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/volume/drivers/san/hp/hp_3par_fc.py
View File

@ -38,7 +38,7 @@ from oslo_log import log as logging
from cinder import exception from cinder import exception
from cinder.i18n import _, _LI from cinder.i18n import _, _LI
import cinder.volume.driver from cinder.volume import driver
from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon
from cinder.volume.drivers.san import san from cinder.volume.drivers.san import san
from cinder.zonemanager import utils as fczm_utils from cinder.zonemanager import utils as fczm_utils
@ -46,7 +46,14 @@ from cinder.zonemanager import utils as fczm_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class HP3PARFCDriver(cinder.volume.driver.FibreChannelDriver): class HP3PARFCDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.CloneableVD,
driver.SnapshotVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.BaseVD):
"""OpenStack Fibre Channel driver to enable 3PAR storage array. """OpenStack Fibre Channel driver to enable 3PAR storage array.
Version history: Version history:
@ -81,10 +88,11 @@ class HP3PARFCDriver(cinder.volume.driver.FibreChannelDriver):
2.0.17 - Improved VLUN creation and deletion logic. #1469816 2.0.17 - Improved VLUN creation and deletion logic. #1469816
2.0.18 - Changed initialize_connection to use getHostVLUNs. #1475064 2.0.18 - Changed initialize_connection to use getHostVLUNs. #1475064
2.0.19 - Adds consistency group support 2.0.19 - Adds consistency group support
2.0.20 - Update driver to use ABC metaclasses
""" """
VERSION = "2.0.19" VERSION = "2.0.20"
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(HP3PARFCDriver, self).__init__(*args, **kwargs) super(HP3PARFCDriver, self).__init__(*args, **kwargs)

14
cinder/volume/drivers/san/hp/hp_3par_iscsi.py
View File

@ -40,7 +40,7 @@ import six
from cinder import exception from cinder import exception
from cinder.i18n import _, _LE, _LW from cinder.i18n import _, _LE, _LW
import cinder.volume.driver from cinder.volume import driver
from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon
from cinder.volume.drivers.san import san from cinder.volume.drivers.san import san
from cinder.volume import utils as volume_utils from cinder.volume import utils as volume_utils
@ -51,7 +51,14 @@ CHAP_USER_KEY = "HPQ-cinder-CHAP-name"
CHAP_PASS_KEY = "HPQ-cinder-CHAP-secret" CHAP_PASS_KEY = "HPQ-cinder-CHAP-secret"
class HP3PARISCSIDriver(cinder.volume.driver.ISCSIDriver): class HP3PARISCSIDriver(driver.TransferVD,
driver.ManageableVD,
driver.ExtendVD,
driver.CloneableVD,
driver.SnapshotVD,
driver.MigrateVD,
driver.ConsistencyGroupVD,
driver.BaseVD):
"""OpenStack iSCSI driver to enable 3PAR storage array. """OpenStack iSCSI driver to enable 3PAR storage array.
Version history: Version history:
@ -91,10 +98,11 @@ class HP3PARISCSIDriver(cinder.volume.driver.ISCSIDriver):
2.0.19 - Changed initialize_connection to use getHostVLUNs. #1475064 2.0.19 - Changed initialize_connection to use getHostVLUNs. #1475064
2.0.20 - Adding changes to support 3PAR iSCSI multipath. 2.0.20 - Adding changes to support 3PAR iSCSI multipath.
2.0.21 - Adds consistency group support 2.0.21 - Adds consistency group support
2.0.22 - Update driver to use ABC metaclasses
""" """
VERSION = "2.0.21" VERSION = "2.0.22"
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(HP3PARISCSIDriver, self).__init__(*args, **kwargs) super(HP3PARISCSIDriver, self).__init__(*args, **kwargs)