Move iscsi helpers to brick directory.

This patch moves the iscsi helpers to the brick
directory.  We're doing this to enable the ability
to have a module/library of core block storage
functionality to use in other OpenStack projects.

After this the next step is to separate out the LVM
and iSCSI code in drivers/lvm.py and then to actually
have the Cinder LVM driver use the new brick LVM module.

Change-Id: I4f8f8b54e801ab63994b5953956c041d8db91fad

diff --git a/cinder/brick/iscsi/__init__.py b/cinder/brick/iscsi/__init__.py
new file mode 100644 (file)
index 0000000..5e8da71
--- /dev/null
+++ b/cinder/brick/iscsi/__init__.py
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

diff --git a/cinder/volume/iscsi.py b/cinder/brick/iscsi/iscsi.py
similarity index 100%
rename from cinder/volume/iscsi.py
rename to cinder/brick/iscsi/iscsi.py

diff --git a/cinder/tests/test_iscsi.py b/cinder/tests/test_iscsi.py
index c20a99f262b6155110dc75e558a5ba5e1a2c524b..321e805146ffada36d975d79ee9d4500b0e84249 100644 (file)
--- a/cinder/tests/test_iscsi.py
+++ b/cinder/tests/test_iscsi.py
@@ -19,8 +19,8 @@ import shutil
 import string
 import tempfile
 
+from cinder.brick.iscsi import iscsi
 from cinder import test
-from cinder.volume import iscsi
 from cinder.volume import utils as volume_utils
 
 

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 744baf5b49d7285b70acedbcd02e28eaf705fbe2..55cd8a2564fdd551a5fd9460c00e021f7c476c26 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -27,6 +27,7 @@ import mox
 import shutil
 import tempfile
 
+from cinder.brick.iscsi import iscsi
 from cinder import context
 from cinder import db
 from cinder import exception
@@ -43,7 +44,6 @@ from cinder.tests import fake_flags
 from cinder.tests.image import fake as fake_image
 from cinder.volume import configuration as conf
 from cinder.volume import driver
-from cinder.volume import iscsi
 
 QUOTAS = quota.QUOTAS
 FLAGS = flags.FLAGS

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 03f18a2b7640e687d61cd4b27b937f7f988aeec1..275ced42fd288db933ce289849071ec9db344444 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -61,7 +61,7 @@ volume_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(volume_opts)
-CONF.import_opt('iscsi_helper', 'cinder.volume.iscsi')
+CONF.import_opt('iscsi_helper', 'cinder.brick.iscsi.iscsi')
 
 
 class VolumeDriver(object):

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index 02adca6030e16cbb5efe2f93de873094edf195e6..7317c2901b9f9e2f5ad140cd1036037fdb7bd454 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -26,13 +26,13 @@ import re
 
 from oslo.config import cfg
 
+from cinder.brick.iscsi import iscsi
 from cinder import exception
 from cinder import flags
 from cinder.image import image_utils
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver
-from cinder.volume import iscsi
 
 LOG = logging.getLogger(__name__)
 

diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py
index e991f8d16cd80087b48b519888f2f787c0367491..988ac647afeab600e617beac96b163188d7ea254 100644 (file)
--- a/cinder/volume/drivers/zadara.py
+++ b/cinder/volume/drivers/zadara.py
@@ -31,7 +31,6 @@ from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver
-from cinder.volume import iscsi
 
 LOG = logging.getLogger("cinder.volume.driver")