X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/ed74dde59b0491f484d3dabf2edbba97f2c2587c..1b2adaa67411daf827d91f5169e859a1571200b8:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 91f3f37..3e40ded 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,9 @@ strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1)))
 # Use bash in order to be able to use pipefail
 SHELL=/bin/bash
 
+# Enable colors in shelltest
+SHELLTESTARGS = "-c"
+
 ACLOCAL_AMFLAGS = -I autotools
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
@@ -37,8 +40,19 @@ CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
 BUILD_RPC = $(top_srcdir)/autotools/build-rpc
 SHELL_ENV_INIT = autotools/shell-env-init
 
+# starting as of Ganeti 2.10, all files are stored in a single directory,
+# with only symbolic links added at other places.
+versiondir = $(libdir)/ganeti-$(VERSION)
+
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
+pkglibdir = $(versiondir)$(libdir)/ganeti
+myexeclibdir = $(pkglibdir)
+bindir = $(versiondir)$(exec_prefix)/bin
+sbindir = $(versiondir)$(exec_prefix)/sbin
+mandir = $(versiondir)$(datarootdir)/man
+pkgpythondir = $(versiondir)$(pythondir)/ganeti
+
 clientdir = $(pkgpythondir)/client
 cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
@@ -54,8 +68,19 @@ utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 iallocatorsdir = $(pkglibdir)/iallocators
 pytoolsdir = $(pkgpythondir)/tools
-docdir = $(datadir)/doc/$(PACKAGE)
-myexeclibdir = $(pkglibdir)
+docdir = $(versiondir)$(datadir)/doc/$(PACKAGE)
+
+SYMLINK_TARGET_DIRS = \
+	$(pythondir) \
+	$(libdir)/ganeti/iallocators \
+	$(exec_prefix)/bin \
+	$(exec_prefix)/sbin \
+	$(datarootdir)/man/man1 \
+	$(datarootdir)/man/man7 \
+	$(datarootdir)/man/man8
+SYMLINK_DIRS = \
+	$(pythondir)/ganeti \
+	$(libdir)/ganeti/tools
 
 # Delete output file if an error occurred while building it
 .DELETE_ON_ERROR:
@@ -65,7 +90,9 @@ HS_DIRS = \
 	src/Ganeti \
 	src/Ganeti/Confd \
 	src/Ganeti/Curl \
+	src/Ganeti/Cpu \
 	src/Ganeti/DataCollectors \
+	src/Ganeti/Hs2Py \
 	src/Ganeti/HTools \
 	src/Ganeti/HTools/Backend \
 	src/Ganeti/HTools/Program \
@@ -76,12 +103,14 @@ HS_DIRS = \
 	src/Ganeti/Storage \
 	src/Ganeti/Storage/Diskstats \
 	src/Ganeti/Storage/Drbd \
+	src/Ganeti/Storage/Lvm \
 	test/hs \
 	test/hs/Test \
 	test/hs/Test/Ganeti \
 	test/hs/Test/Ganeti/Storage \
 	test/hs/Test/Ganeti/Storage/Diskstats \
 	test/hs/Test/Ganeti/Storage/Drbd \
+	test/hs/Test/Ganeti/Storage/Lvm \
 	test/hs/Test/Ganeti/Confd \
 	test/hs/Test/Ganeti/HTools \
 	test/hs/Test/Ganeti/HTools/Backend \
@@ -130,6 +159,8 @@ DIRS = \
 	test/data/ovfdata \
 	test/data/ovfdata/other \
 	test/py \
+	test/py/cmdlib \
+	test/py/cmdlib/testsupport \
 	tools
 
 ALL_APIDOC_HS_DIRS = \
@@ -207,7 +238,9 @@ CLEANFILES = \
 	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
 	$(HS_BUILT_TEST_HELPERS) \
 	src/ganeti-confd \
+	src/ganeti-luxid \
 	src/ganeti-mond \
+	src/hs2py-constants \
 	.hpc/*.mix src/*.tix test/hs/*.tix \
 	doc/hs-lint.html
 
@@ -220,7 +253,7 @@ HS_GENERATED_FILES =
 if WANT_HTOOLS
 HS_GENERATED_FILES += $(HS_PROGS)
 if ENABLE_CONFD
-HS_GENERATED_FILES += src/hconfd src/ganeti-confd
+HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid
 endif
 
 if ENABLE_MOND
@@ -234,7 +267,9 @@ built_base_sources = \
 
 built_python_base_sources = \
 	lib/_autoconf.py \
-	lib/_vcsversion.py
+	lib/_constants.py \
+	lib/_vcsversion.py \
+	lib/opcodes.py
 
 BUILT_PYTHON_SOURCES = \
 	$(built_python_base_sources) \
@@ -249,6 +284,7 @@ BUILT_EXAMPLES = \
 	doc/examples/ganeti-kvm-poweroff.initd \
 	doc/examples/ganeti.cron \
 	doc/examples/ganeti.initd \
+	doc/examples/ganeti.logrotate \
 	doc/examples/ganeti-master-role.ocf \
 	doc/examples/ganeti-node-role.ocf \
 	doc/examples/gnt-config-backup \
@@ -282,7 +318,7 @@ pkgpython_PYTHON = \
 	lib/mcpu.py \
 	lib/netutils.py \
 	lib/objects.py \
-	lib/opcodes.py \
+	lib/opcodes_base.py \
 	lib/outils.py \
 	lib/ovf.py \
 	lib/pathutils.py \
@@ -435,6 +471,7 @@ docinput = \
 	doc/design-cpu-pinning.rst \
 	doc/design-device-uuid-name.rst \
 	doc/design-draft.rst \
+	doc/design-hotplug.rst \
 	doc/design-htools-2.3.rst \
 	doc/design-http-server.rst \
 	doc/design-impexp2.rst \
@@ -447,6 +484,7 @@ docinput = \
 	doc/design-oob.rst \
 	doc/design-ovf-support.rst \
 	doc/design-opportunistic-locking.rst \
+	doc/design-optables.rst \
 	doc/design-partitioned.rst \
 	doc/design-query-splitting.rst \
 	doc/design-query2.rst \
@@ -459,6 +497,7 @@ docinput = \
 	doc/design-x509-ca.rst \
 	doc/design-hroller.rst \
 	doc/design-storagetypes.rst \
+        doc/design-upgrade.rst \
 	doc/devnotes.rst \
 	doc/glossary.rst \
 	doc/hooks.rst \
@@ -468,6 +507,7 @@ docinput = \
 	doc/install.rst \
 	doc/locking.rst \
 	doc/manpages-disabled.rst \
+	doc/monitoring-query-format.rst \
 	doc/move-instance.rst \
 	doc/news.rst \
 	doc/ovfconverter.rst \
@@ -494,6 +534,8 @@ endif
 HS_COMPILE_PROGS= \
 	src/ganeti-mond \
 	src/hconfd \
+	src/hluxid \
+	src/hs2py \
 	src/rpc-test
 
 # All Haskell non-test programs to be compiled but not automatically installed
@@ -509,7 +551,7 @@ HS_ALL_PROGS = \
 	test/hs/htest \
 	$(HS_COMPILE_PROGS)
 
-HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
+HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
 
 HFLAGS = \
@@ -540,17 +582,24 @@ HS_LIB_SRCS = \
 	src/Ganeti/Common.hs \
 	src/Ganeti/Compat.hs \
 	src/Ganeti/Confd/Client.hs \
+	src/Ganeti/Confd/ClientFunctions.hs \
 	src/Ganeti/Confd/Server.hs \
 	src/Ganeti/Confd/Types.hs \
 	src/Ganeti/Confd/Utils.hs \
 	src/Ganeti/Config.hs \
+	src/Ganeti/ConfigReader.hs \
+	src/Ganeti/Constants.hs \
+	src/Ganeti/Cpu/LoadParser.hs \
+	src/Ganeti/Cpu/Types.hs \
 	src/Ganeti/Curl/Multi.hs \
 	src/Ganeti/Daemon.hs \
 	src/Ganeti/DataCollectors/CLI.hs \
+	src/Ganeti/DataCollectors/CPUload.hs \
 	src/Ganeti/DataCollectors/Diskstats.hs \
 	src/Ganeti/DataCollectors/Drbd.hs \
 	src/Ganeti/DataCollectors/InstStatus.hs \
 	src/Ganeti/DataCollectors/InstStatusTypes.hs \
+	src/Ganeti/DataCollectors/Lv.hs \
 	src/Ganeti/DataCollectors/Program.hs \
 	src/Ganeti/DataCollectors/Types.hs \
 	src/Ganeti/Errors.hs \
@@ -584,6 +633,10 @@ HS_LIB_SRCS = \
 	src/Ganeti/Hypervisor/Xen/XmParser.hs \
 	src/Ganeti/Hypervisor/Xen/Types.hs \
 	src/Ganeti/Hash.hs \
+	src/Ganeti/Hs2Py/GenConstants.hs \
+	src/Ganeti/Hs2Py/GenOpCodes.hs \
+	src/Ganeti/Hs2Py/OpDoc.hs \
+	src/Ganeti/HsConstants.hs \
 	src/Ganeti/JQueue.hs \
 	src/Ganeti/JSON.hs \
 	src/Ganeti/Jobs.hs \
@@ -595,6 +648,8 @@ HS_LIB_SRCS = \
 	src/Ganeti/OpCodes.hs \
 	src/Ganeti/OpParams.hs \
 	src/Ganeti/Path.hs \
+	src/Ganeti/Parsers.hs \
+	src/Ganeti/PyValueInstances.hs \
 	src/Ganeti/Query/Cluster.hs \
 	src/Ganeti/Query/Common.hs \
 	src/Ganeti/Query/Export.hs \
@@ -614,6 +669,8 @@ HS_LIB_SRCS = \
 	src/Ganeti/Storage/Diskstats/Types.hs \
 	src/Ganeti/Storage/Drbd/Parser.hs \
 	src/Ganeti/Storage/Drbd/Types.hs \
+	src/Ganeti/Storage/Lvm/LVParser.hs \
+	src/Ganeti/Storage/Lvm/Types.hs \
 	src/Ganeti/Storage/Utils.hs \
 	src/Ganeti/THH.hs \
 	src/Ganeti/Types.hs \
@@ -656,6 +713,7 @@ HS_TEST_SRCS = \
 	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/Storage/Lvm/LVParser.hs \
 	test/hs/Test/Ganeti/THH.hs \
 	test/hs/Test/Ganeti/TestCommon.hs \
 	test/hs/Test/Ganeti/TestHTools.hs \
@@ -667,12 +725,16 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
 
 HS_BUILT_SRCS = \
 	test/hs/Test/Ganeti/TestImports.hs \
-	src/Ganeti/Constants.hs \
+	src/Ganeti/Hs2Py/ListConstants.hs \
+	src/Ganeti/PyConstants.hs \
 	src/Ganeti/Curl/Internal.hs \
 	src/Ganeti/Version.hs
 HS_BUILT_SRCS_IN = \
 	$(patsubst %,%.in,$(filter-out src/Ganeti/Curl/Internal.hs,$(HS_BUILT_SRCS))) \
-	src/Ganeti/Curl/Internal.hsc
+	src/Ganeti/Curl/Internal.hsc \
+	lib/_constants.py.in \
+	lib/opcodes.py.in_after \
+	lib/opcodes.py.in_before
 
 HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS)
 
@@ -689,9 +751,9 @@ doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst)
 # it changes
 doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
 	configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
-	lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \
+	lib/build/shell_example_lexer.py lib/ht.py \
 	doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \
-	| $(BUILT_PYTHON_SOURCES)
+	autotools/sphinx-wrapper | $(BUILT_PYTHON_SOURCES)
 	@test -n "$(SPHINX)" || \
 	    { echo 'sphinx-build' not found during configure; exit 1; }
 if !MANPAGES_IN_DOC
@@ -766,14 +828,17 @@ endif
 # Things to build but not to install (add it to EXTRA_DIST if it should be
 # distributed)
 noinst_DATA = \
-	doc/html \
 	$(BUILT_EXAMPLES) \
 	doc/examples/bash_completion \
 	doc/examples/bash_completion-debug \
 	$(manhtml)
 
+if HAS_SPHINX
 if MANPAGES_IN_DOC
 noinst_DATA += doc/man-html
+else
+noinst_DATA += doc/html
+endif
 endif
 
 gnt_scripts = \
@@ -835,6 +900,22 @@ install-exec-hook:
 	done
 endif
 
+# This target cannot be merged with the '$(HS_ALL_PROGS)' target
+# because 'hs2py-constants' cannot depend on 'Ganeti.Constants'.  And
+# the reason for this is because 'hs2py-constants' needs to generate
+# Python code, and 'Ganeti.Constants' is generated by Python.
+src/hs2py-constants: src/hs2py-constants.hs src/Ganeti/BasicTypes.hs \
+		     src/Ganeti/JSON.hs src/Ganeti/THH.hs \
+		     src/Ganeti/Hs2Py/GenConstants.hs \
+		     src/Ganeti/Hs2Py/ListConstants.hs \
+		     src/Ganeti/HsConstants.hs \
+		     src/Ganeti/PyValueInstances.hs \
+		   | stamp-srclinks
+	$(GHC) --make \
+	  $(HFLAGS) \
+	  -osuf $(notdir $@).o -hisuf $(notdir $@).hi \
+	  $(HEXTRA) $(HEXTRA_INT) src/hs2py-constants.hs
+
 $(HS_ALL_PROGS): %: %.hs $(HS_LIBTESTBUILT_SRCS) Makefile
 	@if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \
 	  echo "Error: cannot run unittests without the development" \
@@ -890,11 +971,20 @@ nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP_SBIN) \
 	daemons/ganeti-cleaner
 
+# strip path prefixes off the sbin scripts
+all_sbin_scripts = \
+	$(patsubst tools/%,%,$(patsubst daemons/%,%,$(patsubst scripts/%,%,\
+	$(patsubst src/%,%,$(dist_sbin_SCRIPTS) $(nodist_sbin_SCRIPTS)))))
+
 if ENABLE_CONFD
 src/ganeti-confd: src/hconfd
 	cp -f $< $@
 
+src/ganeti-luxid: src/hluxid
+	cp -f $< $@
+
 nodist_sbin_SCRIPTS += src/ganeti-confd
+nodist_sbin_SCRIPTS += src/ganeti-luxid
 endif
 
 if ENABLE_MOND
@@ -948,11 +1038,17 @@ myexeclib_SCRIPTS = \
 nodist_myexeclib_SCRIPTS = \
 	$(nodist_pkglib_python_scripts)
 
+# strip path prefixes off the lib python scripts
+all_myexeclib_scripts = \
+	$(patsubst tools/%,%,$(patsubst daemons/%,%,\
+	$(patsubst src/%,%,$(myexeclib_SCRIPTS) $(nodist_myexeclib_SCRIPTS))))
+
 EXTRA_DIST = \
 	NEWS \
 	UPGRADE \
 	epydoc.conf.in \
 	pylintrc \
+	pylintrc-test \
 	autotools/build-bash-completion \
 	autotools/build-rpc \
 	autotools/check-header \
@@ -990,11 +1086,9 @@ EXTRA_DIST = \
 	doc/examples/gnt-debug/README \
 	doc/examples/gnt-debug/delay0.json \
 	doc/examples/gnt-debug/delay50.json \
-	test/py/lockperf.py \
-	test/py/testutils.py \
-	test/py/mocks.py \
 	$(dist_TESTS) \
 	$(TEST_FILES) \
+	$(python_test_support) \
 	man/footer.rst \
 	$(manrst) \
 	$(maninput) \
@@ -1010,6 +1104,7 @@ EXTRA_DIST = \
 man_MANS = \
 	man/ganeti-cleaner.8 \
 	man/ganeti-confd.8 \
+	man/ganeti-luxid.8 \
 	man/ganeti-listrunner.8 \
 	man/ganeti-masterd.8 \
 	man/ganeti-mond.8 \
@@ -1051,6 +1146,10 @@ maninput = \
 	$(patsubst %.html,%.html.in,$(manhtml)) \
 	$(mangen)
 
+manfullpath = $(patsubst man/%.1,man1/%.1,\
+	$(patsubst man/%.7,man7/%.7,\
+	$(patsubst man/%.8,man8/%.8,$(man_MANS))))
+
 TEST_FILES = \
 	test/autotools/autotools-check-news.test \
 	test/data/htools/clean-nonzero-score.data \
@@ -1074,6 +1173,7 @@ TEST_FILES = \
 	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-vcpu.data \
 	test/data/htools/hspace-tiered.data \
 	test/data/htools/invalid-node.data \
 	test/data/htools/missing-resources.data \
@@ -1106,6 +1206,7 @@ TEST_FILES = \
 	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-8.4-no-disk-params.txt \
 	test/data/bdev-drbd-disk.txt \
 	test/data/bdev-drbd-net-ip4.txt \
 	test/data/bdev-drbd-net-ip6.txt \
@@ -1125,7 +1226,9 @@ TEST_FILES = \
 	test/data/cert2.pem \
 	test/data/cluster_config_2.7.json \
 	test/data/cluster_config_2.8.json \
+	test/data/cluster_config_2.9.json \
 	test/data/instance-minor-pairing.txt \
+	test/data/instance-prim-sec.txt \
 	test/data/ip-addr-show-dummy0.txt \
 	test/data/ip-addr-show-lo-ipv4.txt \
 	test/data/ip-addr-show-lo-ipv6.txt \
@@ -1139,6 +1242,7 @@ TEST_FILES = \
 	test/data/kvm_0.9.1_help_boot_test.txt \
 	test/data/kvm_1.0_help.txt \
 	test/data/kvm_1.1.2_help.txt \
+	test/data/lvs_lv.txt \
 	test/data/NEWS_OK.txt \
 	test/data/NEWS_previous_unreleased.txt \
 	test/data/ovfdata/compr_disk.vmdk.gz \
@@ -1195,16 +1299,22 @@ TEST_FILES = \
 
 python_tests = \
 	doc/examples/rapi_testutils.py \
+	test/py/cmdlib/cluster_unittest.py \
+	test/py/cmdlib/cmdlib_unittest.py \
+	test/py/cmdlib/group_unittest.py \
+	test/py/cmdlib/instance_unittest.py \
+	test/py/cmdlib/instance_storage_unittest.py \
+	test/py/cmdlib/test_unittest.py \
 	test/py/cfgupgrade_unittest.py \
 	test/py/docs_unittest.py \
 	test/py/ganeti.asyncnotifier_unittest.py \
 	test/py/ganeti.backend_unittest-runasroot.py \
 	test/py/ganeti.backend_unittest.py \
+	test/py/ganeti.bootstrap_unittest.py \
 	test/py/ganeti.cli_unittest.py \
 	test/py/ganeti.client.gnt_cluster_unittest.py \
 	test/py/ganeti.client.gnt_instance_unittest.py \
 	test/py/ganeti.client.gnt_job_unittest.py \
-	test/py/ganeti.cmdlib_unittest.py \
 	test/py/ganeti.compat_unittest.py \
 	test/py/ganeti.confd.client_unittest.py \
 	test/py/ganeti.config_unittest.py \
@@ -1277,6 +1387,23 @@ python_tests = \
 	test/py/qa.qa_config_unittest.py \
 	test/py/tempfile_fork_unittest.py
 
+python_test_support = \
+	test/py/__init__.py \
+	test/py/lockperf.py \
+	test/py/testutils.py \
+	test/py/mocks.py \
+	test/py/cmdlib/__init__.py \
+	test/py/cmdlib/testsupport/__init__.py \
+	test/py/cmdlib/testsupport/cmdlib_testcase.py \
+	test/py/cmdlib/testsupport/config_mock.py \
+	test/py/cmdlib/testsupport/iallocator_mock.py \
+	test/py/cmdlib/testsupport/lock_manager_mock.py \
+	test/py/cmdlib/testsupport/netutils_mock.py \
+	test/py/cmdlib/testsupport/processor_mock.py \
+	test/py/cmdlib/testsupport/rpc_runner_mock.py \
+	test/py/cmdlib/testsupport/ssh_mock.py \
+	test/py/cmdlib/testsupport/util.py
+
 haskell_tests = test/hs/htest
 
 dist_TESTS = \
@@ -1287,8 +1414,8 @@ dist_TESTS = \
 	test/py/cli-test.bash \
 	test/py/bash_completion.bash
 
-if !PY_NODEV
-	dist_TESTS += $(python_tests)
+if PY_UNIT
+dist_TESTS += $(python_tests)
 endif
 
 nodist_TESTS =
@@ -1307,7 +1434,7 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \
-	PYTHONPATH=. \
+	PYTHONPATH=.:./test/py \
 	TOP_SRCDIR=$(abs_top_srcdir) TOP_BUILDDIR=$(abs_top_builddir) \
 	PYTHON=$(PYTHON) FAKEROOT=$(FAKEROOT_PATH) \
 	$(RUN_IN_TEMPDIR)
@@ -1339,8 +1466,9 @@ all_python_code = \
 	$(noinst_PYTHON) \
 	$(qa_scripts)
 
-if !PY_NODEV
-	all_python_code += $(python_tests)
+if PY_UNIT
+all_python_code += $(python_tests)
+all_python_code += $(python_test_support)
 endif
 
 srclink_files = \
@@ -1390,7 +1518,8 @@ pep8_python_code = \
 	$(CHECK_HEADER) \
 	$(DOCPP) \
 	$(PYTHON_BOOTSTRAP) \
-	qa
+	qa \
+	$(python_test_support)
 
 test/py/daemon-util_unittest.bash: daemons/daemon-util
 
@@ -1503,7 +1632,24 @@ src/Ganeti/Version.hs: src/Ganeti/Version.hs.in \
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
 	sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
-src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \
+src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
+				   src/Ganeti/HsConstants.hs \
+			         | stamp-directories
+	@echo Generating $@
+	@set -e; \
+## Extract constant names from 'HsConstants.hs' by extracting the left
+## side of all lines containing an equal sign (i.e., '=') and
+## prepending the apostrophe sign (i.e., "'").
+##
+## For example, the constant
+##   adminstDown = ...
+## becomes
+##   'adminstDown
+	NAMES=$$(sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p" \
+		 $(abs_top_srcdir)/src/Ganeti/HsConstants.hs); \
+	m4 -DPY_CONSTANT_NAMES="$$NAMES" $(abs_top_srcdir)/$< > $@
+
+src/Ganeti/PyConstants.hs: src/Ganeti/PyConstants.hs.in \
 	lib/constants.py lib/_autoconf.py lib/luxi.py lib/errors.py \
 	lib/jstore.py $(RUN_IN_TEMPDIR) \
 	$(CONVERT_CONSTANTS) $(built_base_sources) \
@@ -1562,10 +1708,7 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
 	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
 	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
-	  echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
-	  echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
 	  echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
-	  echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
 	  echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
 	  echo "KVM_PATH = '$(KVM_PATH)'"; \
 	  echo "IP_PATH = '$(IP_PATH)'"; \
@@ -1588,6 +1731,8 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
 	  echo "CONFD_USER = '$(CONFD_USER)'"; \
 	  echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
+	  echo "LUXID_USER = '$(LUXID_USER)'"; \
+	  echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \
 	  echo "NODED_USER = '$(NODED_USER)'"; \
 	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
 	  echo "MOND_USER = '$(MOND_USER)'"; \
@@ -1609,6 +1754,13 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "}"; \
 	} > $@
 
+lib/_constants.py: Makefile lib/_constants.py.in src/hs2py-constants \
+		 | stamp-directories
+	cat $(abs_top_srcdir)/lib/_constants.py.in > $@
+	src/hs2py-constants >> $@
+
+lib/constants.py: lib/_constants.py
+
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
 	set -e; \
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
@@ -1630,6 +1782,13 @@ lib/_vcsversion.py: Makefile vcs-version | stamp-directories
 	  echo "VCS_VERSION = '$$VCSVER'"; \
 	} > $@
 
+lib/opcodes.py: Makefile src/hs2py src/Ganeti/PyConstants.hs \
+		lib/opcodes.py.in_before lib/opcodes.py.in_after \
+		| stamp-directories
+	cat $(abs_top_srcdir)/lib/opcodes.py.in_before > $@
+	src/hs2py >> $@
+	cat $(abs_top_srcdir)/lib/opcodes.py.in_after >> $@
+
 lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
 	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
 
@@ -1654,8 +1813,8 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 	{ echo 's#@''PREFIX@#$(prefix)#g'; \
 	  echo 's#@''SYSCONFDIR@#$(sysconfdir)#g'; \
 	  echo 's#@''LOCALSTATEDIR@#$(localstatedir)#g'; \
-	  echo 's#@''BINDIR@#$(bindir)#g'; \
-	  echo 's#@''SBINDIR@#$(sbindir)#g'; \
+	  echo 's#@''BINDIR@#$(execprefix)/bin#g'; \
+	  echo 's#@''SBINDIR@#$(execprefix)/sbin#g'; \
 	  echo 's#@''LIBDIR@#$(libdir)#g'; \
 	  echo 's#@''GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
 	  echo 's#@''CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
@@ -1663,17 +1822,18 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 	  echo 's#@''CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
 	  echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
 	  echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
-	  echo 's#@''RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
 	  echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
-	  echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \
+	  echo 's#@''PKGLIBDIR@#$(libdir)/ganeti#g'; \
 	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
 	  echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
 	  echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+	  echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
 	  echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
 	  echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
 	  echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
 	  echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
 	  echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+	  echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \
 	  echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
 	  echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
 	  echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
@@ -1817,15 +1977,30 @@ check-local: check-dirs $(GENERATED_FILES)
 	done; \
 	test -z "$$error"
 
+.PHONY: hs-test-%
+hs-test-%: test/hs/htest | $(BUILT_PYTHON_SOURCES)
+	@rm -f htest.tix
+	test/hs/htest -t $*
+
 .PHONY: hs-tests
 hs-tests: test/hs/htest | $(BUILT_PYTHON_SOURCES)
 	@rm -f htest.tix
 	./test/hs/htest
 
+.PHONY: hs-shell-%
+hs-shell-%: test/hs/hpc-htools test/hs/hpc-mon-collector \
+            $(HS_BUILT_TEST_HELPERS)
+	@rm -f hpc-htools.tix hpc-mon-collector.tix
+	HBINARY="./test/hs/hpc-htools" \
+	SHELLTESTARGS=$(SHELLTESTARGS) \
+	./test/hs/offline-test.sh $*
+
 .PHONY: hs-shell
 hs-shell: test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
 	@rm -f hpc-htools.tix hpc-mon-collector.tix
-	HBINARY="./test/hs/hpc-htools" ./test/hs/offline-test.sh
+	HBINARY="./test/hs/hpc-htools" \
+	SHELLTESTARGS=$(SHELLTESTARGS) \
+	./test/hs/offline-test.sh
 
 .PHONY: hs-check
 hs-check: hs-tests hs-shell
@@ -1848,7 +2023,7 @@ PEP8_IGNORE = E111,E121,E125,E127,E261,E501
 # For excluding pep8 expects filenames only, not whole paths
 PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
 
-LINT_TARGETS = pylint pylint-qa
+LINT_TARGETS = pylint pylint-qa pylint-test
 if HAS_PEP8
 LINT_TARGETS += pep8
 endif
@@ -1870,6 +2045,12 @@ pylint-qa: $(GENERATED_FILES)
 	cd $(top_srcdir)/qa && \
 	  PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \
 	  --rcfile  ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts))
+# FIXME: lint all test code, not just the newly added test support
+pylint-test: $(GENERATED_FILES)
+	@test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
+	cd $(top_srcdir) && \
+		PYTHONPATH=.:./test/py $(PYLINT) $(LINT_OPTS) \
+		--rcfile=pylintrc-test  $(python_test_support)
 
 .PHONY: pep8
 pep8: $(GENERATED_FILES)
@@ -1958,6 +2139,29 @@ install-exec-local:
 	@mkdir_p@ "$(DESTDIR)${localstatedir}/lib/ganeti" \
 	  "$(DESTDIR)${localstatedir}/log/ganeti" \
 	  "$(DESTDIR)${localstatedir}/run/ganeti"
+if INSTALL_SYMLINKS
+	for dir in $(SYMLINK_TARGET_DIRS); do \
+	  @mkdir_p@  $(DESTDIR)$$dir; \
+	done
+	for prog in $(HS_HTOOLS_PROGS); do \
+	  $(LN_S) $(bindir)/$$prog $(DESTDIR)$(exec_prefix)/bin/$$prog; \
+	done
+	$(LN_S) $(bindir)/htools $(DESTDIR)$(libdir)/ganeti/iallocators/hail
+	for prog in $(all_sbin_scripts); do \
+	  $(LN_S) $(sbindir)/$$prog $(DESTDIR)$(exec_prefix)/sbin/$$prog; \
+	done
+	for link in $(SYMLINK_DIRS); do \
+	  $(LN_S) $(versiondir)$$link $(DESTDIR)$$link; \
+	done
+	for prog in $(all_myexeclib_scripts); do \
+	  $(LN_S) $(pkglibdir)/$$prog $(DESTDIR)$(libdir)/ganeti/$$prog; \
+	done
+	if ! test -n '$(ENABLE_MANPAGES)'; then \
+	  for man in $(manfullpath); do \
+	    $(LN_S) $(versiondir)$(datarootdir)/man/$$man $(DESTDIR)$(datarootdir)/man/$$man; \
+	  done; \
+	fi
+endif
 
 .PHONY: apidoc
 if WANT_HSAPIDOC
@@ -2026,7 +2230,7 @@ COVERAGE_TESTS=
 if WANT_HTOOLS
 COVERAGE_TESTS += hs-coverage
 endif
-if !PY_NODEV
+if PY_UNIT
 COVERAGE_TESTS += py-coverage
 endif
 
@@ -2053,7 +2257,7 @@ hs-coverage: $(haskell_tests) test/hs/hpc-htools test/hs/hpc-mon-collector
 	hpc sum --union $(HPCEXCL) \
 	  htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-hs.tix
 	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-hs.tix
-	hpc report coverage-hs.tix
+	hpc report coverage-hs.tix | tee $(COVERAGE_HS_DIR)/report.txt
 	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all