From 84592796090eb6f3e8dda45c4a99c0beb4b79cd9 Mon Sep 17 00:00:00 2001
From: "Erlon R. Cruz" <erlon.cruz@fit-tecnologia.org.br>
Date: Tue, 30 Jun 2015 09:56:45 -0300
Subject: [PATCH] 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
---
...est_hds_hnas_backend.py => test_hitachi_hnas_backend.py} | 4 ++--
.../unit/{test_hds_iscsi.py => test_hitachi_hnas_iscsi.py} | 2 +-
.../unit/{test_hds_nfs.py => test_hitachi_hnas_nfs.py} | 2 +-
cinder/volume/drivers/hds/__init__.py | 0
cinder/volume/drivers/{hds => hitachi}/hnas_backend.py | 0
.../volume/drivers/{hds/iscsi.py => hitachi/hnas_iscsi.py} | 4 ++--
cinder/volume/drivers/{hds/nfs.py => hitachi/hnas_nfs.py} | 4 ++--
cinder/volume/manager.py | 6 +++++-
8 files changed, 13 insertions(+), 9 deletions(-)
rename cinder/tests/unit/{test_hds_hnas_backend.py => test_hitachi_hnas_backend.py} (99%)
rename cinder/tests/unit/{test_hds_iscsi.py => test_hitachi_hnas_iscsi.py} (99%)
rename cinder/tests/unit/{test_hds_nfs.py => test_hitachi_hnas_nfs.py} (99%)
delete mode 100644 cinder/volume/drivers/hds/__init__.py
rename cinder/volume/drivers/{hds => hitachi}/hnas_backend.py (100%)
rename cinder/volume/drivers/{hds/iscsi.py => hitachi/hnas_iscsi.py} (99%)
rename cinder/volume/drivers/{hds/nfs.py => hitachi/hnas_nfs.py} (99%)
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 daab2d987..e0a1fe365 100644
--- 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 1e6cb85a1..8f5e8c795 100644
--- 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 756d58ed5..194fe2d9c 100644
--- 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
index e69de29bb..000000000
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 b171ff9db..0f81831c4 100644
--- 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 d775730eb..cdd3ab119 100644
--- 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 89c3880ea..e77ecca0e 100644
--- 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):
--
2.45.2