Merge branch 'stable-2.8' into master

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a99c84a..abf8f17 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 clientdir = $(pkgpythondir)/client
 cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
+storagedir = $(pkgpythondir)/storage
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
 confddir = $(pkgpythondir)/confd
@@ -62,8 +63,6 @@ myexeclibdir = $(pkglibdir)
 HS_DIRS = \
        src \
        src/Ganeti \
-       src/Ganeti/Block \
-       src/Ganeti/Block/Drbd \
        src/Ganeti/Confd \
        src/Ganeti/Curl \
        src/Ganeti/DataCollectors \
@@ -74,11 +73,15 @@ HS_DIRS = \
        src/Ganeti/Hypervisor/Xen \
        src/Ganeti/Monitoring \
        src/Ganeti/Query \
+       src/Ganeti/Storage \
+       src/Ganeti/Storage/Diskstats \
+       src/Ganeti/Storage/Drbd \
        test/hs \
        test/hs/Test \
        test/hs/Test/Ganeti \
-       test/hs/Test/Ganeti/Block \
-       test/hs/Test/Ganeti/Block/Drbd \
+       test/hs/Test/Ganeti/Storage \
+       test/hs/Test/Ganeti/Storage/Diskstats \
+       test/hs/Test/Ganeti/Storage/Drbd \
        test/hs/Test/Ganeti/Confd \
        test/hs/Test/Ganeti/HTools \
        test/hs/Test/Ganeti/HTools/Backend \
@@ -115,6 +118,7 @@ DIRS = \
        lib/masterd \
        lib/rapi \
        lib/server \
+       lib/storage \
        lib/tools \
        lib/utils \
        lib/watcher \
@@ -260,7 +264,6 @@ pkgpython_PYTHON = \
        lib/__init__.py \
        lib/asyncnotifier.py \
        lib/backend.py \
-       lib/bdev.py \
        lib/bootstrap.py \
        lib/cli.py \
        lib/compat.py \
@@ -289,7 +292,6 @@ pkgpython_PYTHON = \
        lib/serializer.py \
        lib/ssconf.py \
        lib/ssh.py \
-       lib/storage.py \
        lib/uidpool.py \
        lib/vcluster.py \
        lib/network.py \
@@ -338,6 +340,16 @@ hypervisor_PYTHON = \
        lib/hypervisor/hv_lxc.py \
        lib/hypervisor/hv_xen.py
 
+storage_PYTHON = \
+       lib/storage/__init__.py \
+       lib/storage/bdev.py \
+       lib/storage/base.py \
+       lib/storage/container.py \
+       lib/storage/drbd.py \
+       lib/storage/drbd_info.py \
+       lib/storage/drbd_cmdgen.py \
+       lib/storage/filestorage.py
+
 rapi_PYTHON = \
        lib/rapi/__init__.py \
        lib/rapi/baserlib.py \
@@ -396,6 +408,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
@@ -423,6 +436,7 @@ docinput = \
        doc/design-htools-2.3.rst \
        doc/design-http-server.rst \
        doc/design-impexp2.rst \
+       doc/design-internal-shutdown.rst \
        doc/design-lu-generated-jobs.rst \
        doc/design-linuxha.rst \
        doc/design-multi-reloc.rst \
@@ -520,8 +534,6 @@ HPCEXCL = --exclude Main \
        $(patsubst src.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
 
 HS_LIB_SRCS = \
-       src/Ganeti/Block/Drbd/Types.hs \
-       src/Ganeti/Block/Drbd/Parser.hs \
        src/Ganeti/BasicTypes.hs \
        src/Ganeti/Common.hs \
        src/Ganeti/Compat.hs \
@@ -533,7 +545,10 @@ HS_LIB_SRCS = \
        src/Ganeti/Curl/Multi.hs \
        src/Ganeti/Daemon.hs \
        src/Ganeti/DataCollectors/CLI.hs \
+       src/Ganeti/DataCollectors/Diskstats.hs \
        src/Ganeti/DataCollectors/Drbd.hs \
+       src/Ganeti/DataCollectors/InstStatus.hs \
+       src/Ganeti/DataCollectors/InstStatusTypes.hs \
        src/Ganeti/DataCollectors/Program.hs \
        src/Ganeti/DataCollectors/Types.hs \
        src/Ganeti/Errors.hs \
@@ -563,6 +578,7 @@ HS_LIB_SRCS = \
        src/Ganeti/HTools/Program/Hroller.hs \
        src/Ganeti/HTools/Program/Main.hs \
        src/Ganeti/HTools/Types.hs \
+       src/Ganeti/Hypervisor/Xen.hs \
        src/Ganeti/Hypervisor/Xen/XmParser.hs \
        src/Ganeti/Hypervisor/Xen/Types.hs \
        src/Ganeti/Hash.hs \
@@ -577,6 +593,7 @@ HS_LIB_SRCS = \
        src/Ganeti/OpCodes.hs \
        src/Ganeti/OpParams.hs \
        src/Ganeti/Path.hs \
+       src/Ganeti/Query/Cluster.hs \
        src/Ganeti/Query/Common.hs \
        src/Ganeti/Query/Export.hs \
        src/Ganeti/Query/Filter.hs \
@@ -591,6 +608,10 @@ HS_LIB_SRCS = \
        src/Ganeti/Rpc.hs \
        src/Ganeti/Runtime.hs \
        src/Ganeti/Ssconf.hs \
+       src/Ganeti/Storage/Diskstats/Parser.hs \
+       src/Ganeti/Storage/Diskstats/Types.hs \
+       src/Ganeti/Storage/Drbd/Parser.hs \
+       src/Ganeti/Storage/Drbd/Types.hs \
        src/Ganeti/THH.hs \
        src/Ganeti/Types.hs \
        src/Ganeti/Utils.hs
@@ -598,8 +619,6 @@ HS_LIB_SRCS = \
 HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Attoparsec.hs \
        test/hs/Test/Ganeti/BasicTypes.hs \
-       test/hs/Test/Ganeti/Block/Drbd/Parser.hs \
-       test/hs/Test/Ganeti/Block/Drbd/Types.hs \
        test/hs/Test/Ganeti/Common.hs \
        test/hs/Test/Ganeti/Confd/Types.hs \
        test/hs/Test/Ganeti/Confd/Utils.hs \
@@ -631,6 +650,9 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Rpc.hs \
        test/hs/Test/Ganeti/Runtime.hs \
        test/hs/Test/Ganeti/Ssconf.hs \
+       test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs \
+       test/hs/Test/Ganeti/Storage/Drbd/Parser.hs \
+       test/hs/Test/Ganeti/Storage/Drbd/Types.hs \
        test/hs/Test/Ganeti/THH.hs \
        test/hs/Test/Ganeti/TestCommon.hs \
        test/hs/Test/Ganeti/TestHTools.hs \
@@ -788,7 +810,9 @@ qa_scripts = \
        qa/qa_error.py \
        qa/qa_group.py \
        qa/qa_instance.py \
+       qa/qa_instance_utils.py \
        qa/qa_job.py \
+       qa/qa_monitoring.py \
        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_rapi.py \
@@ -1029,6 +1053,7 @@ TEST_FILES = \
        test/data/htools/hail-alloc-invalid-network.json \
        test/data/htools/hail-alloc-invalid-twodisks.json \
        test/data/htools/hail-alloc-restricted-network.json \
+       test/data/htools/hail-alloc-spindles.json \
        test/data/htools/hail-alloc-twodisks.json \
        test/data/htools/hail-change-group.json \
        test/data/htools/hail-invalid-reloc.json \
@@ -1036,18 +1061,25 @@ TEST_FILES = \
        test/data/htools/hail-reloc-drbd.json \
        test/data/htools/hbal-excl-tags.data \
        test/data/htools/hbal-split-insts.data \
+       test/data/htools/hspace-tiered-dualspec-exclusive.data \
        test/data/htools/hspace-tiered-dualspec.data \
+       test/data/htools/hspace-tiered-exclusive.data \
        test/data/htools/hspace-tiered-ipolicy.data \
+       test/data/htools/hspace-tiered-mixed.data \
        test/data/htools/hspace-tiered-resourcetypes.data \
        test/data/htools/hspace-tiered.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \
        test/data/htools/multiple-master.data \
+       test/data/htools/multiple-tags.data \
        test/data/htools/n1-failure.data \
        test/data/htools/rapi/groups.json \
        test/data/htools/rapi/info.json \
        test/data/htools/rapi/instances.json \
        test/data/htools/rapi/nodes.json \
+       test/data/htools/hroller-nodegroups.data \
+       test/data/htools/hroller-nonredundant.data \
+       test/data/htools/hroller-online.data \
        test/data/htools/unique-reboot-order.data \
        test/hs/shelltests/htools-balancing.test \
        test/hs/shelltests/htools-basic.test \
@@ -1065,6 +1097,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 \
@@ -1083,7 +1116,7 @@ TEST_FILES = \
        test/data/cert1.pem \
        test/data/cert2.pem \
        test/data/cluster_config_2.7.json \
-       test/data/cluster_config_downgraded_2.7.json \
+       test/data/cluster_config_2.8.json \
        test/data/instance-minor-pairing.txt \
        test/data/ip-addr-show-dummy0.txt \
        test/data/ip-addr-show-lo-ipv4.txt \
@@ -1125,12 +1158,16 @@ TEST_FILES = \
        test/data/ovfdata/wrong_manifest.ovf \
        test/data/ovfdata/wrong_ova.ova \
        test/data/ovfdata/wrong_xml.ovf \
+       test/data/proc_diskstats.txt \
        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 \
@@ -1155,7 +1192,6 @@ 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.cli_unittest.py \
        test/py/ganeti.client.gnt_cluster_unittest.py \
        test/py/ganeti.client.gnt_instance_unittest.py \
@@ -1202,7 +1238,10 @@ python_tests = \
        test/py/ganeti.server.rapi_unittest.py \
        test/py/ganeti.ssconf_unittest.py \
        test/py/ganeti.ssh_unittest.py \
-       test/py/ganeti.storage_unittest.py \
+       test/py/ganeti.storage.bdev_unittest.py \
+       test/py/ganeti.storage.container_unittest.py \
+       test/py/ganeti.storage.drbd_unittest.py \
+       test/py/ganeti.storage.filestorage_unittest.py \
        test/py/ganeti.tools.burnin_unittest.py \
        test/py/ganeti.tools.ensure_dirs_unittest.py \
        test/py/ganeti.tools.node_daemon_setup_unittest.py \
@@ -1219,6 +1258,7 @@ python_tests = \
        test/py/ganeti.utils.nodesetup_unittest.py \
        test/py/ganeti.utils.process_unittest.py \
        test/py/ganeti.utils.retry_unittest.py \
+       test/py/ganeti.utils.storage_unittest.py \
        test/py/ganeti.utils.text_unittest.py \
        test/py/ganeti.utils.wrapper_unittest.py \
        test/py/ganeti.utils.x509_unittest.py \
@@ -1278,6 +1318,7 @@ all_python_code = \
        $(client_PYTHON) \
        $(cmdlib_PYTHON) \
        $(hypervisor_PYTHON) \
+       $(storage_PYTHON) \
        $(rapi_PYTHON) \
        $(server_PYTHON) \
        $(pytools_PYTHON) \