Browse Source

Move Fujitsu ETERNUS DX related file

Since there are three volume driver files relating to
Fujitsu ETERNUS DX in cinder.volume.drivers.fujitsu,
Due to the need to distinguish from the new series,
I make 'eternus_dx' directory at cinder.volume.drivers.fujitsu
and I move these files to the directory.

Change-Id: I605698e7cf028e4fcf4896ce676250b00ecb7c86
changes/21/631121/5
Mingyue Qian 3 years ago
parent
commit
5d39f67105
  1. 6
      cinder/opts.py
  2. 9
      cinder/tests/unit/volume/drivers/test_fujitsu_dx.py
  3. 0
      cinder/volume/drivers/fujitsu/eternus_dx/__init__.py
  4. 0
      cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_common.py
  5. 2
      cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_fc.py
  6. 2
      cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_iscsi.py
  7. 4
      cinder/volume/manager.py
  8. 8
      doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst
  9. 8
      releasenotes/notes/fujitsu-eternus-dx-update-4755ec446030d263.yaml

6
cinder/opts.py

@ -93,8 +93,8 @@ from cinder.volume.drivers.dell_emc import xtremio as \
cinder_volume_drivers_dell_emc_xtremio
from cinder.volume.drivers import drbdmanagedrv as \
cinder_volume_drivers_drbdmanagedrv
from cinder.volume.drivers.fujitsu import eternus_dx_common as \
cinder_volume_drivers_fujitsu_eternusdxcommon
from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common as \
cinder_volume_drivers_fujitsu_eternus_dx_eternusdxcommon
from cinder.volume.drivers.fusionstorage import dsware as \
cinder_volume_drivers_fusionstorage_dsware
from cinder.volume.drivers.hpe import hpe_3par_common as \
@ -293,7 +293,7 @@ def list_opts():
cinder_volume_drivers_dell_emc_vnx_common.VNX_OPTS,
cinder_volume_drivers_dell_emc_xtremio.XTREMIO_OPTS,
cinder_volume_drivers_drbdmanagedrv.drbd_opts,
cinder_volume_drivers_fujitsu_eternusdxcommon.
cinder_volume_drivers_fujitsu_eternus_dx_eternusdxcommon.
FJ_ETERNUS_DX_OPT_opts,
cinder_volume_drivers_fusionstorage_dsware.volume_opts,
cinder_volume_drivers_hpe_hpe3parcommon.hpe3par_opts,

9
cinder/tests/unit/volume/drivers/test_fujitsu.py → cinder/tests/unit/volume/drivers/test_fujitsu_dx.py

@ -25,9 +25,12 @@ from cinder import test
from cinder.volume import configuration as conf
with mock.patch.dict('sys.modules', pywbem=mock.Mock()):
from cinder.volume.drivers.fujitsu import eternus_dx_common as dx_common
from cinder.volume.drivers.fujitsu import eternus_dx_fc as dx_fc
from cinder.volume.drivers.fujitsu import eternus_dx_iscsi as dx_iscsi
from cinder.volume.drivers.fujitsu.eternus_dx \
import eternus_dx_common as dx_common
from cinder.volume.drivers.fujitsu.eternus_dx \
import eternus_dx_fc as dx_fc
from cinder.volume.drivers.fujitsu.eternus_dx \
import eternus_dx_iscsi as dx_iscsi
CONFIG_FILE_NAME = 'cinder_fujitsu_eternus_dx.xml'
STORAGE_SYSTEM = '172.16.0.2'

0
cinder/volume/drivers/fujitsu/eternus_dx/__init__.py

0
cinder/volume/drivers/fujitsu/eternus_dx_common.py → cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_common.py

2
cinder/volume/drivers/fujitsu/eternus_dx_fc.py → cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_fc.py

@ -24,7 +24,7 @@ import six
from cinder import interface
from cinder.volume import driver
from cinder.volume.drivers.fujitsu import eternus_dx_common
from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common
from cinder.zonemanager import utils as fczm_utils
LOG = logging.getLogger(__name__)

2
cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py → cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_iscsi.py

@ -23,7 +23,7 @@ import six
from cinder import interface
from cinder.volume import driver
from cinder.volume.drivers.fujitsu import eternus_dx_common
from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

4
cinder/volume/manager.py

@ -177,6 +177,10 @@ MAPPING = {
'cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver',
'cinder.volume.drivers.dell_emc.vmax.fc.VMAXFCDriver':
'cinder.volume.drivers.dell_emc.powermax.fc.PowerMaxFCDriver',
'cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver':
'cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver',
'cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver':
'cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver'
}

8
doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst

@ -101,14 +101,14 @@ Configuration
.. code-block:: ini
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver
cinder_eternus_config_file = /etc/cinder/eternus_dx.xml
iSCSI entries:
.. code-block:: ini
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver
cinder_eternus_config_file = /etc/cinder/eternus_dx.xml
If there is no description about ``cinder_eternus_config_file``,
@ -200,12 +200,12 @@ Configuration example
enabled_backends = DXFC, DXISCSI
[DXFC]
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver
cinder_eternus_config_file = /etc/cinder/fc.xml
volume_backend_name = FC
[DXISCSI]
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver
volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver
cinder_eternus_config_file = /etc/cinder/iscsi.xml
volume_backend_name = ISCSI

8
releasenotes/notes/fujitsu-eternus-dx-update-4755ec446030d263.yaml

@ -0,0 +1,8 @@
---
upgrade:
- The Fujitsu DX driver names have been updated to distinguish
them from other Fujitsu storage. The module path
``cinder.volume.drivers.fujitsu`` should now be updated to
``cinder.volume.drivers.fujitsu.eternus_dx`` in ``cinder.conf``.
Support for the previous driver naming will continue to work,
but will be removed in a future release.
Loading…
Cancel
Save