Merge remote-tracking branch 'origin/stable-2.8'

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d7cc0b7..98b7cb4 100644 (file)
--- 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 \
@@ -315,6 +316,14 @@ 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
+
 rapi_PYTHON = \
        lib/rapi/__init__.py \
        lib/rapi/baserlib.py \
@@ -373,6 +382,7 @@ utils_PYTHON = \
        lib/utils/nodesetup.py \
        lib/utils/process.py \
        lib/utils/retry.py \
+       lib/utils/storage.py \
        lib/utils/text.py \
        lib/utils/wrapper.py \
        lib/utils/x509.py
@@ -1034,6 +1044,7 @@ TEST_FILES = \
        test/hs/shelltests/htools-mon-collector.test \
        test/data/bdev-drbd-8.0.txt \
        test/data/bdev-drbd-8.3.txt \
+       test/data/bdev-drbd-8.4.txt \
        test/data/bdev-drbd-disk.txt \
        test/data/bdev-drbd-net-ip4.txt \
        test/data/bdev-drbd-net-ip6.txt \
@@ -1094,10 +1105,13 @@ TEST_FILES = \
        test/data/ovfdata/wrong_xml.ovf \
        test/data/proc_drbd8.txt \
        test/data/proc_drbd80-emptyline.txt \
+       test/data/proc_drbd80-emptyversion.txt \
        test/data/proc_drbd83.txt \
        test/data/proc_drbd83_sync.txt \
        test/data/proc_drbd83_sync_want.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
+       test/data/proc_drbd84.txt \
+       test/data/proc_drbd84_sync.txt \
        test/data/qa-minimal-nodes-instances-only.json \
        test/data/sys_drbd_usermode_helper.txt \
        test/data/vgreduce-removemissing-2.02.02.txt \
@@ -1121,7 +1135,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.bdev_unittest.py \
+       test/py/ganeti.block.bdev_unittest.py \
+       test/py/ganeti.block.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 \
@@ -1241,6 +1256,7 @@ all_python_code = \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
        $(hypervisor_PYTHON) \
+       $(block_PYTHON) \
        $(rapi_PYTHON) \
        $(server_PYTHON) \
        $(pytools_PYTHON) \