openstack
/
cinder
Code Issues Proposed changes

Merge "Move nimble driver code to hpe folder"

This commit is contained in:
Zuul 2022-03-02 11:54:20 +00:00 committed by Gerrit Code Review
parent c7135ca1f0 d67dcf42d4
commit fab51b6af0
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/opts.py
View File

@ -102,6 +102,8 @@ from cinder.volume.drivers.hitachi import hbsd_rest_fc as \
cinder_volume_drivers_hitachi_hbsdrestfc
from cinder.volume.drivers.hpe import hpe_3par_common as \
cinder_volume_drivers_hpe_hpe3parcommon
from cinder.volume.drivers.hpe import nimble as \
cinder_volume_drivers_hpe_nimble
from cinder.volume.drivers.huawei import common as \
cinder_volume_drivers_huawei_common
from cinder.volume.drivers.ibm import flashsystem_common as \
@ -147,7 +149,6 @@ from cinder.volume.drivers.netapp import options as \
from cinder.volume.drivers.nexenta import options as \
cinder_volume_drivers_nexenta_options
from cinder.volume.drivers import nfs as cinder_volume_drivers_nfs
from cinder.volume.drivers import nimble as cinder_volume_drivers_nimble
from cinder.volume.drivers.open_e import options as \
cinder_volume_drivers_open_e_options
from cinder.volume.drivers.prophetstor import options as \
@ -336,6 +337,7 @@ def list_opts():
cinder_volume_drivers_hitachi_hbsdrest.REST_VOLUME_OPTS,
cinder_volume_drivers_hitachi_hbsdrestfc.FC_VOLUME_OPTS,
cinder_volume_drivers_hpe_hpe3parcommon.hpe3par_opts,
cinder_volume_drivers_hpe_nimble.nimble_opts,
cinder_volume_drivers_huawei_common.huawei_opts,
cinder_volume_drivers_ibm_flashsystemcommon.flashsystem_opts,
cinder_volume_drivers_ibm_flashsystemiscsi.
@ -381,7 +383,6 @@ def list_opts():
cinder_volume_drivers_nexenta_options.NEXENTA_RRMGR_OPTS,
cinder_volume_drivers_nexenta_options.NEXENTA_EDGE_OPTS,
cinder_volume_drivers_nfs.nfs_opts,
cinder_volume_drivers_nimble.nimble_opts,
cinder_volume_drivers_prophetstor_options.DPL_OPTS,
cinder_volume_drivers_pure.PURE_OPTS,
cinder_volume_drivers_qnap.qnap_opts,

14
cinder/tests/unit/volume/drivers/test_nimble.py → cinder/tests/unit/volume/drivers/hpe/test_nimble.py
View File

@ -30,16 +30,16 @@ from cinder.tests.unit import fake_group
from cinder.tests.unit import fake_snapshot
from cinder.tests.unit import fake_volume
from cinder.tests.unit import test
from cinder.volume.drivers import nimble
from cinder.volume.drivers.hpe import nimble
from cinder.volume import volume_types
from cinder.volume import volume_utils
NIMBLE_CLIENT = 'cinder.volume.drivers.nimble.NimbleRestAPIExecutor'
NIMBLE_URLLIB2 = 'cinder.volume.drivers.nimble.requests'
NIMBLE_RANDOM = 'cinder.volume.drivers.nimble.random'
NIMBLE_ISCSI_DRIVER = 'cinder.volume.drivers.nimble.NimbleISCSIDriver'
NIMBLE_FC_DRIVER = 'cinder.volume.drivers.nimble.NimbleFCDriver'
DRIVER_VERSION = '4.1.0'
NIMBLE_CLIENT = 'cinder.volume.drivers.hpe.nimble.NimbleRestAPIExecutor'
NIMBLE_URLLIB2 = 'cinder.volume.drivers.hpe.nimble.requests'
NIMBLE_RANDOM = 'cinder.volume.drivers.hpe.nimble.random'
NIMBLE_ISCSI_DRIVER = 'cinder.volume.drivers.hpe.nimble.NimbleISCSIDriver'
NIMBLE_FC_DRIVER = 'cinder.volume.drivers.hpe.nimble.NimbleFCDriver'
DRIVER_VERSION = '4.2.0'
nimble.DEFAULT_SLEEP = 0
FAKE_POSITIVE_LOGIN_RESPONSE_1 = '2c20aad78a220ed1dae21dcd6f9446f5'

6
cinder/volume/drivers/nimble.py → cinder/volume/drivers/hpe/nimble.py
View File

@ -48,7 +48,7 @@ from cinder.volume import volume_utils
from cinder.zonemanager import utils as fczm_utils
DRIVER_VERSION = "4.1.0"
DRIVER_VERSION = "4.2.0"
AES_256_XTS_CIPHER = 'aes_256_xts'
DEFAULT_CIPHER = 'none'
EXTRA_SPEC_ENCRYPTION = 'nimble:encryption'
@ -136,11 +136,13 @@ class NimbleBaseVolumeDriver(san.SanDriver):
4.1.0 - Added multiattach support
Added revert to snapshot support
Added consistency groups support
4.2.0 - The Nimble driver is now located in the
cinder.volume.drivers.hpe module.
"""
VERSION = DRIVER_VERSION
# ThirdPartySystems wiki page
CI_WIKI_NAME = "Nimble_Storage_CI"
CI_WIKI_NAME = "HPE_Nimble_Storage_CI"
def __init__(self, *args, **kwargs):
super(NimbleBaseVolumeDriver, self).__init__(*args, **kwargs)

4
cinder/volume/manager.py
View File

@ -186,6 +186,10 @@ MAPPING = {
'cinder.volume.drivers.dell_emc.powerflex.driver.PowerFlexDriver',
'cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver':
'cinder.volume.drivers.zadara.zadara.ZadaraVPSAISCSIDriver',
'cinder.volume.drivers.nimble.NimbleISCSIDriver':
'cinder.volume.drivers.hpe.nimble.NimbleISCSIDriver',
'cinder.volume.drivers.nimble.NimbleFCDriver':
'cinder.volume.drivers.hpe.nimble.NimbleFCDriver',
}

6
doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst
View File

@ -106,8 +106,8 @@ NIMBLE_PASSWORD
Password of the admin account for Nimble/Alletra 6k array.
NIMBLE_VOLUME_DRIVER
Use either cinder.volume.drivers.nimble.NimbleISCSIDriver for iSCSI or
cinder.volume.drivers.nimble.NimbleFCDriver for Fibre Channel.
Use either cinder.volume.drivers.hpe.nimble.NimbleISCSIDriver for iSCSI or
cinder.volume.drivers.hpe.nimble.NimbleFCDriver for Fibre Channel.
NIMBLE_BACKEND_NAME
A volume back-end name which is specified in the ``cinder.conf`` file.
@ -168,7 +168,7 @@ The Nimble/Alletra 6k storage driver supports these configuration options:
.. config-table::
:config-target: Nimble
cinder.volume.drivers.nimble
cinder.volume.drivers.hpe.nimble
Multipathing
~~~~~~~~~~~~

12
releasenotes/notes/nimble-change-location-277b7fc0c39fd91d.yaml Normal file
View File

@ -0,0 +1,12 @@
---
upgrade:
- |
The Nimble Storage became a part of the HPE family of Storage solutions.
The cinder Nimble driver has been relocated to the
``cinder.volume.driver.hpe`` module to reflect this.
The impact on operators is that the module path
``cinder.volume.drivers.nimble.NimbleISCSIDriver`` and
``cinder.volume.drivers.nimble.FCDriver`` should now be updated to
``cinder.volume.drivers.hpe.nimble.NimbleISCSIDriver`` and
``cinder.volume.drivers.hpe.nimble.NimbleFCDriver`` respectively in
``cinder.conf``