Move HDS drivers to Hitachi folder

This patch moves the drivers from Hitachi to a common folder. Now all Hitachi
drivers will be under 'cinder/volume/drivers/hitachi'.

Change-Id: I2c725b9a130f055d7da487329c1e09abb333bcd4
Implements: blueprint rename-hitachi-drivers

diff --git a/cinder/tests/unit/test_hds_hnas_backend.py b/cinder/tests/unit/test_hitachi_hnas_backend.py
similarity index 99%
rename from cinder/tests/unit/test_hds_hnas_backend.py
rename to cinder/tests/unit/test_hitachi_hnas_backend.py
index daab2d987bfe0c42ff92bfabbcd0cab20ea32f41..e0a1fe36549e2adc7d72068af69aec56e135d966 100644 (file)
--- a/cinder/tests/unit/test_hds_hnas_backend.py
+++ b/cinder/tests/unit/test_hitachi_hnas_backend.py
@@ -21,8 +21,8 @@ from oslo_log import log as logging
 
 from cinder import test
 from cinder import utils
-from cinder.volume.drivers.hds import hnas_backend
-from cinder.volume.drivers.hds import nfs
+from cinder.volume.drivers.hitachi import hnas_backend
+from cinder.volume.drivers.hitachi import hnas_nfs as nfs
 
 CONF = cfg.CONF
 

diff --git a/cinder/tests/unit/test_hds_iscsi.py b/cinder/tests/unit/test_hitachi_hnas_iscsi.py
similarity index 99%
rename from cinder/tests/unit/test_hds_iscsi.py
rename to cinder/tests/unit/test_hitachi_hnas_iscsi.py
index 1e6cb85a12961acc97f00068a8174cf156b25297..8f5e8c7952348a5d863de19d43fa6c9ccab3ce93 100644 (file)
--- a/cinder/tests/unit/test_hds_iscsi.py
+++ b/cinder/tests/unit/test_hitachi_hnas_iscsi.py
@@ -28,7 +28,7 @@ import six
 from cinder import exception
 from cinder import test
 from cinder.volume import configuration as conf
-from cinder.volume.drivers.hds import iscsi
+from cinder.volume.drivers.hitachi import hnas_iscsi as iscsi
 from cinder.volume import volume_types
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/unit/test_hds_nfs.py b/cinder/tests/unit/test_hitachi_hnas_nfs.py
similarity index 99%
rename from cinder/tests/unit/test_hds_nfs.py
rename to cinder/tests/unit/test_hitachi_hnas_nfs.py
index 756d58ed5560ac21d04cac4a5131139fde008207..194fe2d9c3e5fab13954573aa917f64e78bed8d2 100644 (file)
--- a/cinder/tests/unit/test_hds_nfs.py
+++ b/cinder/tests/unit/test_hitachi_hnas_nfs.py
@@ -24,7 +24,7 @@ import six
 from cinder import exception
 from cinder import test
 from cinder.volume import configuration as conf
-from cinder.volume.drivers.hds import nfs
+from cinder.volume.drivers.hitachi import hnas_nfs as nfs
 from cinder.volume import volume_types
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/hds/__init__.py b/cinder/volume/drivers/hds/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/cinder/volume/drivers/hds/hnas_backend.py b/cinder/volume/drivers/hitachi/hnas_backend.py
similarity index 100%
rename from cinder/volume/drivers/hds/hnas_backend.py
rename to cinder/volume/drivers/hitachi/hnas_backend.py

diff --git a/cinder/volume/drivers/hds/iscsi.py b/cinder/volume/drivers/hitachi/hnas_iscsi.py
similarity index 99%
rename from cinder/volume/drivers/hds/iscsi.py
rename to cinder/volume/drivers/hitachi/hnas_iscsi.py
index b171ff9db85a3ce31155811db8d558abb89f0f42..0f81831c4b0ff0ac12f1bb24b1c8dfaa4532b549 100644 (file)
--- a/cinder/volume/drivers/hds/iscsi.py
+++ b/cinder/volume/drivers/hitachi/hnas_iscsi.py
@@ -28,12 +28,12 @@ from oslo_utils import units
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
 from cinder.volume import driver
-from cinder.volume.drivers.hds import hnas_backend
+from cinder.volume.drivers.hitachi import hnas_backend
 from cinder.volume import utils
 from cinder.volume import volume_types
 
 
-HDS_HNAS_ISCSI_VERSION = '3.0.0'
+HDS_HNAS_ISCSI_VERSION = '3.0.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hitachi/hnas_nfs.py
similarity index 99%
rename from cinder/volume/drivers/hds/nfs.py
rename to cinder/volume/drivers/hitachi/hnas_nfs.py
index d775730eb88be7922a0a04c30a842952fad2c2b7..cdd3ab11942d067cce65128c6aeeffc9b52a5b17 100644 (file)
--- a/cinder/volume/drivers/hds/nfs.py
+++ b/cinder/volume/drivers/hitachi/hnas_nfs.py
@@ -30,13 +30,13 @@ from oslo_utils import units
 from cinder import exception
 from cinder.i18n import _, _LE, _LI
 from cinder.image import image_utils
-from cinder.volume.drivers.hds import hnas_backend
+from cinder.volume.drivers.hitachi import hnas_backend
 from cinder.volume.drivers import nfs
 from cinder.volume import utils
 from cinder.volume import volume_types
 
 
-HDS_HNAS_NFS_VERSION = '3.0.0'
+HDS_HNAS_NFS_VERSION = '3.0.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 89c3880ead8ecbbe8ba08b2d1c2d88a32013a246..e77ecca0e314d065865a48a7a9d82ad544e0a99b 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -116,7 +116,11 @@ MAPPING = {
     'cinder.volume.drivers.fujitsu_eternus_dx_fc.FJDXFCDriver':
     'cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver',
     'cinder.volume.drivers.fujitsu_eternus_dx_iscsi.FJDXISCSIDriver':
-    'cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver', }
+    'cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver',
+    'cinder.volume.drivers.hds.nfs.HDSNFSDriver':
+    'cinder.volume.drivers.hitachi.hnas_nfs.HDSNFSDriver',
+    'cinder.volume.drivers.hds.iscsi.HDSISCSIDriver':
+    'cinder.volume.drivers.hitachi.hnas_iscsi.HDSISCSIDriver'}
 
 
 def locked_volume_operation(f):