Rename dir 'block' to 'storage'

Renaming the 'block' directory to 'storage', because I plan to
place code there that is related to file storage and leaving
it named 'block' would be misleading.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/Makefile.am b/Makefile.am
index 4728e55..6b94fe5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 # the directory + 'dir' suffix
 clientdir = $(pkgpythondir)/client
 hypervisordir = $(pkgpythondir)/hypervisor
-blockdir = $(pkgpythondir)/block
+storagedir = $(pkgpythondir)/storage
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
 confddir = $(pkgpythondir)/confd
@@ -109,11 +109,11 @@ DIRS = \
        lib/confd \
        lib/http \
        lib/hypervisor \
-       lib/block \
        lib/impexpd \
        lib/masterd \
        lib/rapi \
        lib/server \
+       lib/storage \
        lib/tools \
        lib/utils \
        lib/watcher \
@@ -316,13 +316,13 @@ hypervisor_PYTHON = \
        lib/hypervisor/hv_lxc.py \
        lib/hypervisor/hv_xen.py
 
-block_PYTHON = \
-       lib/block/__init__.py \
-       lib/block/bdev.py \
-       lib/block/base.py \
-       lib/block/drbd.py \
-       lib/block/drbd_info.py \
-       lib/block/drbd_cmdgen.py
+storage_PYTHON = \
+       lib/storage/__init__.py \
+       lib/storage/bdev.py \
+       lib/storage/base.py \
+       lib/storage/drbd.py \
+       lib/storage/drbd_info.py \
+       lib/storage/drbd_cmdgen.py
 
 rapi_PYTHON = \
        lib/rapi/__init__.py \
@@ -1142,8 +1142,8 @@ python_tests = \
        test/py/ganeti.asyncnotifier_unittest.py \
        test/py/ganeti.backend_unittest-runasroot.py \
        test/py/ganeti.backend_unittest.py \
-       test/py/ganeti.block.bdev_unittest.py \
-       test/py/ganeti.block.drbd_unittest.py \
+       test/py/ganeti.storage.bdev_unittest.py \
+       test/py/ganeti.storage.drbd_unittest.py \
        test/py/ganeti.cli_unittest.py \
        test/py/ganeti.client.gnt_cluster_unittest.py \
        test/py/ganeti.client.gnt_instance_unittest.py \
@@ -1263,7 +1263,7 @@ all_python_code = \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
        $(hypervisor_PYTHON) \
-       $(block_PYTHON) \
+       $(storage_PYTHON) \
        $(rapi_PYTHON) \
        $(server_PYTHON) \
        $(pytools_PYTHON) \

diff --git a/lib/backend.py b/lib/backend.py
index dc13b02..215fdf5 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -54,8 +54,8 @@ from ganeti import utils
 from ganeti import ssh
 from ganeti import hypervisor
 from ganeti import constants
-from ganeti.block import bdev
-from ganeti.block import drbd
+from ganeti.storage import bdev
+from ganeti.storage import drbd
 from ganeti import objects
 from ganeti import ssconf
 from ganeti import serializer
@@ -65,8 +65,8 @@ from ganeti import compat
 from ganeti import pathutils
 from ganeti import vcluster
 from ganeti import ht
-from ganeti.block.base import BlockDev
-from ganeti.block.drbd import DRBD8
+from ganeti.storage.base import BlockDev
+from ganeti.storage.drbd import DRBD8
 from ganeti import hooksmaster
 
 

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index d648c77..1df7645 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -40,7 +40,7 @@ from ganeti import objects
 from ganeti import ssconf
 from ganeti import serializer
 from ganeti import hypervisor
-from ganeti.block import drbd
+from ganeti.storage import drbd
 from ganeti import netutils
 from ganeti import luxi
 from ganeti import jstore

diff --git a/lib/block/__init__.py b/lib/storage/__init__.py
similarity index 100%
rename from lib/block/__init__.py
rename to lib/storage/__init__.py

diff --git a/lib/block/base.py b/lib/storage/base.py
similarity index 100%
rename from lib/block/base.py
rename to lib/storage/base.py

diff --git a/lib/block/bdev.py b/lib/storage/bdev.py
similarity index 99%
rename from lib/block/bdev.py
rename to lib/storage/bdev.py
index f533918..289df93 100644 (file)
--- a/lib/block/bdev.py
+++ b/lib/storage/bdev.py
@@ -35,8 +35,8 @@ from ganeti import objects
 from ganeti import compat
 from ganeti import pathutils
 from ganeti import serializer
-from ganeti.block import drbd
-from ganeti.block import base
+from ganeti.storage import drbd
+from ganeti.storage import base
 
 
 class RbdShowmappedJsonError(Exception):

diff --git a/lib/block/drbd.py b/lib/storage/drbd.py
similarity index 99%
rename from lib/block/drbd.py
rename to lib/storage/drbd.py
index 3cb78b4..c50a217 100644 (file)
--- a/lib/block/drbd.py
+++ b/lib/storage/drbd.py
@@ -30,10 +30,10 @@ from ganeti import utils
 from ganeti import errors
 from ganeti import netutils
 from ganeti import objects
-from ganeti.block import base
-from ganeti.block.drbd_info import DRBD8Info
-from ganeti.block import drbd_info
-from ganeti.block import drbd_cmdgen
+from ganeti.storage import base
+from ganeti.storage.drbd_info import DRBD8Info
+from ganeti.storage import drbd_info
+from ganeti.storage import drbd_cmdgen
 
 
 # Size of reads in _CanReadDevice

diff --git a/lib/block/drbd_cmdgen.py b/lib/storage/drbd_cmdgen.py
similarity index 100%
rename from lib/block/drbd_cmdgen.py
rename to lib/storage/drbd_cmdgen.py

diff --git a/lib/block/drbd_info.py b/lib/storage/drbd_info.py
similarity index 99%
rename from lib/block/drbd_info.py
rename to lib/storage/drbd_info.py
index cf0cda7..0cd8944 100644 (file)
--- a/lib/block/drbd_info.py
+++ b/lib/storage/drbd_info.py
@@ -29,7 +29,7 @@ from ganeti import constants
 from ganeti import utils
 from ganeti import errors
 from ganeti import compat
-from ganeti.block import base
+from ganeti.storage import base
 
 
 class DRBD8Status(object): # pylint: disable=R0902

diff --git a/lib/watcher/nodemaint.py b/lib/watcher/nodemaint.py
index c3b82c0..b9ca7e9 100644 (file)
--- a/lib/watcher/nodemaint.py
+++ b/lib/watcher/nodemaint.py
@@ -32,7 +32,7 @@ from ganeti import netutils
 from ganeti import ssconf
 from ganeti import utils
 from ganeti import confd
-from ganeti.block import drbd
+from ganeti.storage import drbd
 
 import ganeti.confd.client # pylint: disable=W0611
 

diff --git a/test/py/ganeti.block.bdev_unittest.py b/test/py/ganeti.storage.bdev_unittest.py
similarity index 99%
rename from test/py/ganeti.block.bdev_unittest.py
rename to test/py/ganeti.storage.bdev_unittest.py
index c6c18de..4d8e830 100755 (executable)
--- a/test/py/ganeti.block.bdev_unittest.py
+++ b/test/py/ganeti.storage.bdev_unittest.py
@@ -31,7 +31,7 @@ from ganeti import constants
 from ganeti import errors
 from ganeti import objects
 from ganeti import utils
-from ganeti.block import bdev
+from ganeti.storage import bdev
 
 import testutils
 

diff --git a/test/py/ganeti.block.drbd_unittest.py b/test/py/ganeti.storage.drbd_unittest.py
similarity index 99%
rename from test/py/ganeti.block.drbd_unittest.py
rename to test/py/ganeti.storage.drbd_unittest.py
index fcba8ee..f77bbdc 100755 (executable)
--- a/test/py/ganeti.block.drbd_unittest.py
+++ b/test/py/ganeti.storage.drbd_unittest.py
@@ -26,9 +26,9 @@ import os
 
 from ganeti import constants
 from ganeti import errors
-from ganeti.block import drbd
-from ganeti.block import drbd_info
-from ganeti.block import drbd_cmdgen
+from ganeti.storage import drbd
+from ganeti.storage import drbd_info
+from ganeti.storage import drbd_cmdgen
 
 import testutils