From d67dcf42d4cc7c727db115b1e0a9c8a8a7270b2b Mon Sep 17 00:00:00 2001 From: Ajitha Robert Date: Tue, 13 Apr 2021 06:44:12 -0700 Subject: [PATCH] Move nimble driver code to hpe folder blueprint nimble-change-location Change-Id: Id1f111462fc2558b90f9066387498bcb5e3217b2 --- cinder/opts.py | 5 +++-- .../unit/volume/drivers/{ => hpe}/test_nimble.py | 14 +++++++------- cinder/volume/drivers/{ => hpe}/nimble.py | 6 ++++-- cinder/volume/manager.py | 4 ++++ .../block-storage/drivers/nimble-volume-driver.rst | 6 +++--- .../nimble-change-location-277b7fc0c39fd91d.yaml | 12 ++++++++++++ 6 files changed, 33 insertions(+), 14 deletions(-) rename cinder/tests/unit/volume/drivers/{ => hpe}/test_nimble.py (99%) rename cinder/volume/drivers/{ => hpe}/nimble.py (99%) create mode 100644 releasenotes/notes/nimble-change-location-277b7fc0c39fd91d.yaml diff --git a/cinder/opts.py b/cinder/opts.py index e0343d5cd07..40b18317c12 100644 --- a/cinder/opts.py +++ b/cinder/opts.py @@ -101,6 +101,8 @@ from cinder.volume.drivers.hitachi import hbsd_rest as \ cinder_volume_drivers_hitachi_hbsdrest 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 \ @@ -143,7 +145,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 \ @@ -331,6 +332,7 @@ def list_opts(): cinder_volume_drivers_hitachi_hbsdfc.FC_VOLUME_OPTS, cinder_volume_drivers_hitachi_hbsdrest.REST_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. @@ -372,7 +374,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, diff --git a/cinder/tests/unit/volume/drivers/test_nimble.py b/cinder/tests/unit/volume/drivers/hpe/test_nimble.py similarity index 99% rename from cinder/tests/unit/volume/drivers/test_nimble.py rename to cinder/tests/unit/volume/drivers/hpe/test_nimble.py index 5fdbb77040e..f760c309ca1 100644 --- a/cinder/tests/unit/volume/drivers/test_nimble.py +++ b/cinder/tests/unit/volume/drivers/hpe/test_nimble.py @@ -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' diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/hpe/nimble.py similarity index 99% rename from cinder/volume/drivers/nimble.py rename to cinder/volume/drivers/hpe/nimble.py index cc5202fb992..1dab27d9611 100644 --- a/cinder/volume/drivers/nimble.py +++ b/cinder/volume/drivers/hpe/nimble.py @@ -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) diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 1912a103724..971e08d8360 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -185,6 +185,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', } diff --git a/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst b/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst index c8929ba400f..001177e1809 100644 --- a/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst @@ -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 ~~~~~~~~~~~~ diff --git a/releasenotes/notes/nimble-change-location-277b7fc0c39fd91d.yaml b/releasenotes/notes/nimble-change-location-277b7fc0c39fd91d.yaml new file mode 100644 index 00000000000..76c6cecdc7a --- /dev/null +++ b/releasenotes/notes/nimble-change-location-277b7fc0c39fd91d.yaml @@ -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``