From ce9283c15df390ebfd3e3dcdd5c57b13b3d258b4 Mon Sep 17 00:00:00 2001
From: Thomas Thrainer <thomasth@google.com>
Date: Tue, 23 Apr 2013 14:04:22 +0200
Subject: [PATCH] Move lib/bdev.py to lib/block/bdev.py
That's in preparation of extracting DRBD related code from bdev.py. As
bdev.py is already rather long, new features will require to split it
into more manageable pieces. That's why it's moved in an own directory.
Signed-off-by: Thomas Thrainer <thomasth@google.com>
Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---
Makefile.am | 10 ++++++--
lib/backend.py | 2 +-
lib/block/__init__.py | 24 +++++++++++++++++++
lib/{ => block}/bdev.py | 0
lib/bootstrap.py | 2 +-
lib/hypervisor/hv_xen.py | 2 +-
lib/watcher/nodemaint.py | 2 +-
...ttest.py => ganeti.block.bdev_unittest.py} | 2 +-
8 files changed, 37 insertions(+), 7 deletions(-)
create mode 100644 lib/block/__init__.py
rename lib/{ => block}/bdev.py (100%)
rename test/py/{ganeti.bdev_unittest.py => ganeti.block.bdev_unittest.py} (99%)
diff --git a/Makefile.am b/Makefile.am
index 34f8d8a0d..8f979c73a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
# the directory + 'dir' suffix
clientdir = $(pkgpythondir)/client
hypervisordir = $(pkgpythondir)/hypervisor
+blockdir = $(pkgpythondir)/block
httpdir = $(pkgpythondir)/http
masterddir = $(pkgpythondir)/masterd
confddir = $(pkgpythondir)/confd
@@ -108,6 +109,7 @@ DIRS = \
lib/confd \
lib/http \
lib/hypervisor \
+ lib/block \
lib/impexpd \
lib/masterd \
lib/rapi \
@@ -257,7 +259,6 @@ pkgpython_PYTHON = \
lib/__init__.py \
lib/asyncnotifier.py \
lib/backend.py \
- lib/bdev.py \
lib/bootstrap.py \
lib/cli.py \
lib/cmdlib.py \
@@ -314,6 +315,10 @@ hypervisor_PYTHON = \
lib/hypervisor/hv_lxc.py \
lib/hypervisor/hv_xen.py
+block_PYTHON = \
+ lib/block/__init__.py \
+ lib/block/bdev.py
+
rapi_PYTHON = \
lib/rapi/__init__.py \
lib/rapi/baserlib.py \
@@ -1112,7 +1117,7 @@ python_tests = \
test/py/ganeti.asyncnotifier_unittest.py \
test/py/ganeti.backend_unittest-runasroot.py \
test/py/ganeti.backend_unittest.py \
- test/py/ganeti.bdev_unittest.py \
+ test/py/ganeti.block.bdev_unittest.py \
test/py/ganeti.cli_unittest.py \
test/py/ganeti.client.gnt_cluster_unittest.py \
test/py/ganeti.client.gnt_instance_unittest.py \
@@ -1232,6 +1237,7 @@ all_python_code = \
$(pkgpython_PYTHON) \
$(client_PYTHON) \
$(hypervisor_PYTHON) \
+ $(block_PYTHON) \
$(rapi_PYTHON) \
$(server_PYTHON) \
$(pytools_PYTHON) \
diff --git a/lib/backend.py b/lib/backend.py
index 7d8315d6b..c4f8d82f5 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -54,7 +54,7 @@ from ganeti import utils
from ganeti import ssh
from ganeti import hypervisor
from ganeti import constants
-from ganeti import bdev
+from ganeti.block import bdev
from ganeti import objects
from ganeti import ssconf
from ganeti import serializer
diff --git a/lib/block/__init__.py b/lib/block/__init__.py
new file mode 100644
index 000000000..9b9e38c39
--- /dev/null
+++ b/lib/block/__init__.py
@@ -0,0 +1,24 @@
+#
+#
+
+# Copyright (C) 2006, 2007, 2008 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+"""Block device abstraction
+
+"""
diff --git a/lib/bdev.py b/lib/block/bdev.py
similarity index 100%
rename from lib/bdev.py
rename to lib/block/bdev.py
diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 40da336ad..2183d6b08 100644
--- 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 import bdev
+from ganeti.block import bdev
from ganeti import netutils
from ganeti import luxi
from ganeti import jstore
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 8789571bc..77d323f10 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -270,7 +270,7 @@ def _GetConfigFileDiskData(block_devices, blockdev_prefix,
@param block_devices: list of tuples (cfdev, rldev):
- cfdev: dict containing ganeti config disk part
- - rldev: ganeti.bdev.BlockDev object
+ - rldev: ganeti.block.bdev.BlockDev object
@param blockdev_prefix: a string containing blockdevice prefix,
e.g. "sd" for /dev/sda
diff --git a/lib/watcher/nodemaint.py b/lib/watcher/nodemaint.py
index 6cb2a48de..a0a830064 100644
--- a/lib/watcher/nodemaint.py
+++ b/lib/watcher/nodemaint.py
@@ -25,7 +25,6 @@
import logging
-from ganeti import bdev
from ganeti import constants
from ganeti import errors
from ganeti import hypervisor
@@ -33,6 +32,7 @@ from ganeti import netutils
from ganeti import ssconf
from ganeti import utils
from ganeti import confd
+from ganeti.block import bdev
import ganeti.confd.client # pylint: disable=W0611
diff --git a/test/py/ganeti.bdev_unittest.py b/test/py/ganeti.block.bdev_unittest.py
similarity index 99%
rename from test/py/ganeti.bdev_unittest.py
rename to test/py/ganeti.block.bdev_unittest.py
index 8243375c5..161058228 100755
--- a/test/py/ganeti.bdev_unittest.py
+++ b/test/py/ganeti.block.bdev_unittest.py
@@ -26,12 +26,12 @@ import os
import random
import unittest
-from ganeti import bdev
from ganeti import compat
from ganeti import constants
from ganeti import errors
from ganeti import objects
from ganeti import utils
+from ganeti.block import bdev
import testutils
--
GitLab