X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/2db5364598282bafd386627ec5fc4fcc88ad2e4c..26d62e4ced78ba5f3fea05583dae54b1324ed33a:/Makefile.am diff --git a/Makefile.am b/Makefile.am index d6e3927..c199d6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ DOCPP = $(top_srcdir)/autotools/docpp REPLACE_VARS_SED = autotools/replace_vars.sed CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants BUILD_RPC = $(top_srcdir)/autotools/build-rpc +SHELL_ENV_INIT = autotools/shell-env-init # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix @@ -58,7 +59,14 @@ HTOOLS_DIRS = \ htools/Ganeti \ htools/Ganeti/Confd \ htools/Ganeti/HTools \ - htools/Ganeti/HTools/Program + htools/Ganeti/HTools/Program \ + htools/Ganeti/Query \ + htest \ + htest/Test \ + htest/Test/Ganeti \ + htest/Test/Ganeti/Confd \ + htest/Test/Ganeti/HTools \ + htest/Test/Ganeti/Query DIRS = \ autotools \ @@ -86,10 +94,11 @@ DIRS = \ qa \ test \ test/data \ - test/data/htools \ - test/data/htools/rapi \ test/data/ovfdata \ test/data/ovfdata/other \ + htest/data \ + htest/data/rapi \ + htest/shelltests \ tools BUILDTIME_DIR_AUTOCREATE = \ @@ -101,6 +110,7 @@ BUILDTIME_DIR_AUTOCREATE = \ $(APIDOC_HS_DIR)/Ganeti/Confd \ $(APIDOC_HS_DIR)/Ganeti/HTools \ $(APIDOC_HS_DIR)/Ganeti/HTools/Program \ + $(APIDOC_HS_DIR)/Ganeti/Query \ $(COVERAGE_DIR) \ $(COVERAGE_PY_DIR) \ $(COVERAGE_HS_DIR) \ @@ -115,8 +125,6 @@ DIRCHECK_EXCLUDE = \ ganeti-[0-9]*.[0-9]*.[0-9]* \ doc/html/_* -all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIR_AUTOCREATE)) - # some helper vars COVERAGE_DIR = doc/coverage COVERAGE_PY_DIR = $(COVERAGE_DIR)/py @@ -140,37 +148,47 @@ CLEANFILES = \ $(addsuffix /*.py[co],$(DIRS)) \ $(addsuffix /*.hi,$(HTOOLS_DIRS)) \ $(addsuffix /*.o,$(HTOOLS_DIRS)) \ - $(all_dirfiles) \ $(PYTHON_BOOTSTRAP) \ epydoc.conf \ - autotools/replace_vars.sed \ + $(REPLACE_VARS_SED) \ + $(SHELL_ENV_INIT) \ daemons/daemon-util \ daemons/ganeti-cleaner \ + daemons/ganeti-master-cleaner \ devel/upload \ $(BUILT_EXAMPLES) \ doc/examples/bash_completion \ + doc/examples/bash_completion-debug \ lib/_generated_rpc.py \ $(man_MANS) \ $(manhtml) \ tools/kvm-ifup \ + tools/vcluster-setup \ + stamp-directories \ stamp-srclinks \ $(nodist_pkgpython_PYTHON) \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ - .hpc/*.mix htools/*.tix \ + htools/ganeti-confd \ + .hpc/*.mix htools/*.tix htest/*.tix \ doc/hs-lint.html -# BUILT_SOURCES should only be used as a dependency on phony -# targets. Otherwise it'll cause the target to rebuild every time. -BUILT_SOURCES = \ - $(built_base_sources) \ +GENERATED_FILES = \ + $(built_base_sources) \ $(BUILT_PYTHON_SOURCES) \ $(PYTHON_BOOTSTRAP) +HTOOLS_GENERATED_FILES = +if WANT_HTOOLS +HTOOLS_GENERATED_FILES += $(HS_PROGS) +if ENABLE_CONFD +HTOOLS_GENERATED_FILES += htools/hconfd +endif +endif + built_base_sources = \ - ganeti \ - stamp-srclinks \ - $(all_dirfiles) + stamp-directories \ + stamp-srclinks built_python_base_sources = \ lib/_autoconf.py \ @@ -180,8 +198,8 @@ BUILT_PYTHON_SOURCES = \ $(built_python_base_sources) \ lib/_generated_rpc.py -# Generating the RPC wrappers depends on many things, so make sure it's built at -# the end of the built sources +# Generating the RPC wrappers depends on many things, so make sure +# it's built at the end of the built sources lib/_generated_rpc.py: | $(built_base_sources) $(built_python_base_sources) # these are all built from the underlying %.in sources @@ -221,8 +239,10 @@ pkgpython_PYTHON = \ lib/mcpu.py \ lib/netutils.py \ lib/objects.py \ + lib/objectutils.py \ lib/opcodes.py \ lib/ovf.py \ + lib/pathutils.py \ lib/qlang.py \ lib/query.py \ lib/rpc.py \ @@ -233,6 +253,7 @@ pkgpython_PYTHON = \ lib/ssh.py \ lib/storage.py \ lib/uidpool.py \ + lib/vcluster.py \ lib/workerpool.py client_PYTHON = \ @@ -272,12 +293,11 @@ http_PYTHON = \ confd_PYTHON = \ lib/confd/__init__.py \ - lib/confd/client.py \ - lib/confd/querylib.py \ - lib/confd/server.py + lib/confd/client.py masterd_PYTHON = \ lib/masterd/__init__.py \ + lib/masterd/iallocator.py \ lib/masterd/instance.py impexpd_PYTHON = \ @@ -290,7 +310,6 @@ watcher_PYTHON = \ server_PYTHON = \ lib/server/__init__.py \ - lib/server/confd.py \ lib/server/masterd.py \ lib/server/noded.py \ lib/server/rapi.py @@ -335,11 +354,15 @@ docrst = \ doc/design-network.rst \ doc/design-chained-jobs.rst \ doc/design-ovf-support.rst \ + doc/design-autorepair.rst \ doc/design-resource-model.rst \ doc/cluster-merge.rst \ doc/design-shared-storage.rst \ doc/design-node-state-cache.rst \ doc/design-virtual-clusters.rst \ + doc/design-bulk-create.rst \ + doc/design-query-splitting.rst \ + doc/design-partitioned.rst \ doc/devnotes.rst \ doc/glossary.rst \ doc/hooks.rst \ @@ -350,78 +373,130 @@ docrst = \ doc/locking.rst \ doc/move-instance.rst \ doc/news.rst \ + doc/ovfconverter.rst \ doc/rapi.rst \ doc/security.rst \ doc/upgrade.rst \ + doc/virtual-cluster.rst \ doc/walkthrough.rst HS_PROGS = htools/htools -HS_BIN_ROLES = hbal hscan hspace hinfo +HS_BIN_ROLES = hbal hscan hspace hinfo hcheck +HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail -HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd +HS_ALL_PROGS = $(HS_PROGS) htest/test htest/hpc-htools htools/hconfd HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) -HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail +HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.) HEXTRA = -# internal extra flags (used for htools/test mainly) +# internal extra flags (used for htest/test mainly) HEXTRA_INT = # exclude options for coverage reports HPCEXCL = --exclude Main \ --exclude Ganeti.Constants \ --exclude Ganeti.THH \ --exclude Ganeti.HTools.QC \ - --exclude Ganeti.HTools.QCHelper \ - --exclude Ganeti.HTools.Version + --exclude Ganeti.Version \ + --exclude Test.Ganeti.TestCommon \ + --exclude Test.Ganeti.TestHTools \ + --exclude Test.Ganeti.TestHelper \ + --exclude Test.Ganeti.TestImports \ + $(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS)))) HS_LIB_SRCS = \ htools/Ganeti/HTools/CLI.hs \ htools/Ganeti/HTools/Cluster.hs \ - htools/Ganeti/HTools/Compat.hs \ htools/Ganeti/HTools/Container.hs \ htools/Ganeti/HTools/ExtLoader.hs \ htools/Ganeti/HTools/Group.hs \ htools/Ganeti/HTools/IAlloc.hs \ htools/Ganeti/HTools/Instance.hs \ - htools/Ganeti/HTools/JSON.hs \ htools/Ganeti/HTools/Loader.hs \ htools/Ganeti/HTools/Luxi.hs \ htools/Ganeti/HTools/Node.hs \ htools/Ganeti/HTools/PeerMap.hs \ - htools/Ganeti/HTools/QC.hs \ - htools/Ganeti/HTools/QCHelper.hs \ htools/Ganeti/HTools/Rapi.hs \ htools/Ganeti/HTools/Simu.hs \ htools/Ganeti/HTools/Text.hs \ htools/Ganeti/HTools/Types.hs \ - htools/Ganeti/HTools/Utils.hs \ htools/Ganeti/HTools/Program.hs \ htools/Ganeti/HTools/Program/Hail.hs \ htools/Ganeti/HTools/Program/Hbal.hs \ + htools/Ganeti/HTools/Program/Hcheck.hs \ htools/Ganeti/HTools/Program/Hinfo.hs \ htools/Ganeti/HTools/Program/Hscan.hs \ htools/Ganeti/HTools/Program/Hspace.hs \ htools/Ganeti/BasicTypes.hs \ + htools/Ganeti/Common.hs \ + htools/Ganeti/Compat.hs \ htools/Ganeti/Confd.hs \ htools/Ganeti/Confd/Server.hs \ + htools/Ganeti/Confd/Utils.hs \ htools/Ganeti/Config.hs \ htools/Ganeti/Daemon.hs \ htools/Ganeti/Hash.hs \ htools/Ganeti/Jobs.hs \ + htools/Ganeti/JSON.hs \ htools/Ganeti/Logging.hs \ htools/Ganeti/Luxi.hs \ htools/Ganeti/Objects.hs \ htools/Ganeti/OpCodes.hs \ + htools/Ganeti/Path.hs \ + htools/Ganeti/Query/Common.hs \ + htools/Ganeti/Query/Filter.hs \ + htools/Ganeti/Query/Group.hs \ + htools/Ganeti/Query/Language.hs \ + htools/Ganeti/Query/Node.hs \ + htools/Ganeti/Query/Query.hs \ + htools/Ganeti/Query/Server.hs \ + htools/Ganeti/Query/Types.hs \ + htools/Ganeti/Rpc.hs \ htools/Ganeti/Runtime.hs \ htools/Ganeti/Ssconf.hs \ htools/Ganeti/THH.hs \ - htools/Ganeti/Query2.hs - -HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs + htools/Ganeti/Utils.hs + +HS_TEST_SRCS = \ + htest/Test/Ganeti/BasicTypes.hs \ + htest/Test/Ganeti/Common.hs \ + htest/Test/Ganeti/Daemon.hs \ + htest/Test/Ganeti/Confd/Utils.hs \ + htest/Test/Ganeti/HTools/CLI.hs \ + htest/Test/Ganeti/HTools/Cluster.hs \ + htest/Test/Ganeti/HTools/Container.hs \ + htest/Test/Ganeti/HTools/Instance.hs \ + htest/Test/Ganeti/HTools/Loader.hs \ + htest/Test/Ganeti/HTools/Node.hs \ + htest/Test/Ganeti/HTools/PeerMap.hs \ + htest/Test/Ganeti/HTools/Simu.hs \ + htest/Test/Ganeti/HTools/Text.hs \ + htest/Test/Ganeti/HTools/Types.hs \ + htest/Test/Ganeti/JSON.hs \ + htest/Test/Ganeti/Jobs.hs \ + htest/Test/Ganeti/Luxi.hs \ + htest/Test/Ganeti/Objects.hs \ + htest/Test/Ganeti/OpCodes.hs \ + htest/Test/Ganeti/Query/Filter.hs \ + htest/Test/Ganeti/Query/Language.hs \ + htest/Test/Ganeti/Query/Query.hs \ + htest/Test/Ganeti/Rpc.hs \ + htest/Test/Ganeti/Ssconf.hs \ + htest/Test/Ganeti/TestCommon.hs \ + htest/Test/Ganeti/TestHTools.hs \ + htest/Test/Ganeti/TestHelper.hs \ + htest/Test/Ganeti/Utils.hs + +HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS) + +HS_BUILT_SRCS = \ + htest/Test/Ganeti/TestImports.hs \ + htools/Ganeti/Constants.hs \ + htools/Ganeti/Version.hs HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS)) -$(RUN_IN_TEMPDIR): | $(all_dirfiles) +$(RUN_IN_TEMPDIR): | stamp-directories # Note: we use here an order-only prerequisite, as the contents of # _autoconf.py are not actually influencing the html build output: it @@ -471,6 +546,7 @@ noinst_DATA = \ doc/html \ $(BUILT_EXAMPLES) \ doc/examples/bash_completion \ + doc/examples/bash_completion-debug \ $(manhtml) gnt_scripts = \ @@ -490,10 +566,6 @@ PYTHON_BOOTSTRAP_SBIN = \ daemons/ganeti-rapi \ $(gnt_scripts) -if PY_CONFD -PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd -endif - PYTHON_BOOTSTRAP = \ $(PYTHON_BOOTSTRAP_SBIN) \ tools/ensure-dirs @@ -527,35 +599,33 @@ install-exec-hook: $(LN_S) -f htools \ $(DESTDIR)$(bindir)/$$role ; \ done -if HS_CONFD - mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd -endif endif -$(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile +$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile @if [ -z "$(HTOOLS)" ]; then \ echo "Error: htools compilation disabled at configure time" 1>&2 ;\ exit 1; \ fi - @BINARY=$(@:htools/%=%); \ - if [ "$BINARY" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \ + @if [ "$(notdir $@)" = "test" ] && [ -z "$(GHC_PKG_QUICKCHECK)" ]; then \ echo "Error: cannot run unittests without the QuickCheck library (see devnotes.rst)" 1>&2; \ exit 1; \ fi - rm -f $(@:htools/%=%).tix - BINARY=$(@:htools/%=%); $(GHC) --make \ + @rm -f $(notdir $@).tix + $(GHC) --make \ $(HFLAGS) \ $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \ - -osuf $$BINARY.o -hisuf $$BINARY.hi \ + -osuf $(notdir $@).o -hisuf $(notdir $@).hi \ $(HEXTRA) $(HEXTRA_INT) $@ -# for the htools/test binary, we need to enable profiling/coverage -htools/test: HEXTRA_INT=-fhpc + @touch "$@" + +# for the htest/test binary, we need to enable profiling/coverage +htest/test: HEXTRA_INT=-fhpc -ihtest # we compile the hpc-htools binary with the program coverage -htools/hpc-htools: HEXTRA_INT=-fhpc +htest/hpc-htools: HEXTRA_INT=-fhpc # test dependency -htools/offline-tests.sh: htools/hpc-htools +htest/offline-tests.sh: htest/hpc-htools # rules for building profiling-enabled versions of the haskell # programs: hs-prof does the full two-step build, whereas @@ -563,23 +633,27 @@ htools/offline-tests.sh: htools/hpc-htools # run before) .PHONY: hs-prof hs-prof-quick hs-prof: - $(MAKE) clean - $(MAKE) $(HS_ALL_PROGS) HEXTRA="-osuf .o" + $(MAKE) $(AM_MAKEFLAGS) clean + $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .o" rm -f $(HS_ALL_PROGS) - $(MAKE) hs-prof-quick + $(MAKE) $(AM_MAKEFLAGS) hs-prof-quick hs-prof-quick: - $(MAKE) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all" + $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf .prof_o -prof -auto-all" dist_sbin_SCRIPTS = \ tools/ganeti-listrunner nodist_sbin_SCRIPTS = \ $(PYTHON_BOOTSTRAP_SBIN) \ - daemons/ganeti-cleaner + daemons/ganeti-cleaner \ + daemons/ganeti-master-cleaner + +if ENABLE_CONFD +htools/ganeti-confd: htools/hconfd + cp -f $< $@ -if HS_CONFD -nodist_sbin_SCRIPTS += htools/hconfd +nodist_sbin_SCRIPTS += htools/ganeti-confd endif python_scripts = \ @@ -602,6 +676,9 @@ dist_tools_SCRIPTS = \ tools/xm-console-wrapper \ tools/master-ip-setup +nodist_tools_SCRIPTS = \ + tools/vcluster-setup + pkglib_python_scripts = \ daemons/import-export \ tools/check-cert-expired @@ -640,9 +717,11 @@ EXTRA_DIST = \ $(RUN_IN_TEMPDIR) \ daemons/daemon-util.in \ daemons/ganeti-cleaner.in \ + daemons/ganeti-master-cleaner.in \ $(pkglib_python_scripts) \ devel/upload.in \ tools/kvm-ifup.in \ + tools/vcluster-setup.in \ $(docdot) \ $(docpng) \ $(docrst) \ @@ -665,15 +744,16 @@ EXTRA_DIST = \ $(maninput) \ qa/qa-sample.json \ $(qa_scripts) \ - $(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \ + $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS_IN) \ $(HS_PROG_SRCS) \ htools/lint-hints.hs \ - htools/cli-tests-defs.sh \ - htools/offline-test.sh + htest/cli-tests-defs.sh \ + htest/offline-test.sh man_MANS = \ man/ganeti.7 \ man/ganeti-cleaner.8 \ + man/ganeti-master-cleaner.8 \ man/ganeti-confd.8 \ man/ganeti-listrunner.8 \ man/ganeti-masterd.8 \ @@ -691,6 +771,7 @@ man_MANS = \ man/gnt-os.8 \ man/hail.1 \ man/hbal.1 \ + man/hcheck.1 \ man/hinfo.1 \ man/hscan.1 \ man/hspace.1 \ @@ -728,18 +809,6 @@ TEST_FILES = \ test/data/kvm_0.12.5_help.txt \ test/data/kvm_0.9.1_help.txt \ test/data/sys_drbd_usermode_helper.txt \ - test/data/htools/hail-alloc-drbd.json \ - test/data/htools/hail-change-group.json \ - test/data/htools/hail-invalid-reloc.json \ - test/data/htools/hail-node-evac.json \ - test/data/htools/hail-reloc-drbd.json \ - test/data/htools/common-suffix.data \ - test/data/htools/invalid-node.data \ - test/data/htools/missing-resources.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/ovfdata/compr_disk.vmdk.gz \ test/data/ovfdata/config.ini \ test/data/ovfdata/corrupted_resources.ovf \ @@ -773,18 +842,31 @@ TEST_FILES = \ test/import-export_unittest-helper \ test/gnt-cli.test \ test/ganeti-cli.test \ - test/htools-balancing.test \ - test/htools-basic.test \ - test/htools-dynutil.test \ - test/htools-excl.test \ - test/htools-hail.test \ - test/htools-hspace.test \ - test/htools-invalid.test \ - test/htools-multi-group.test \ - test/htools-no-backend.test \ - test/htools-rapi.test \ - test/htools-single-group.test \ - test/htools-text-backend.test + htest/shelltests/htools-balancing.test \ + htest/shelltests/htools-basic.test \ + htest/shelltests/htools-dynutil.test \ + htest/shelltests/htools-excl.test \ + htest/shelltests/htools-hail.test \ + htest/shelltests/htools-hspace.test \ + htest/shelltests/htools-invalid.test \ + htest/shelltests/htools-multi-group.test \ + htest/shelltests/htools-no-backend.test \ + htest/shelltests/htools-rapi.test \ + htest/shelltests/htools-single-group.test \ + htest/shelltests/htools-text-backend.test \ + htest/data/hail-alloc-drbd.json \ + htest/data/hail-change-group.json \ + htest/data/hail-invalid-reloc.json \ + htest/data/hail-node-evac.json \ + htest/data/hail-reloc-drbd.json \ + htest/data/hbal-split-insts.data \ + htest/data/common-suffix.data \ + htest/data/invalid-node.data \ + htest/data/missing-resources.data \ + htest/data/rapi/groups.json \ + htest/data/rapi/info.json \ + htest/data/rapi/instances.json \ + htest/data/rapi/nodes.json python_tests = \ doc/examples/rapi_testutils.py \ @@ -815,10 +897,12 @@ python_tests = \ test/ganeti.jstore_unittest.py \ test/ganeti.locking_unittest.py \ test/ganeti.luxi_unittest.py \ + test/ganeti.masterd.iallocator_unittest.py \ test/ganeti.masterd.instance_unittest.py \ test/ganeti.mcpu_unittest.py \ test/ganeti.netutils_unittest.py \ test/ganeti.objects_unittest.py \ + test/ganeti.objectutils_unittest.py \ test/ganeti.opcodes_unittest.py \ test/ganeti.ovf_unittest.py \ test/ganeti.qlang_unittest.py \ @@ -839,6 +923,7 @@ python_tests = \ test/ganeti.utils.filelock_unittest.py \ test/ganeti.utils.hash_unittest.py \ test/ganeti.utils.io_unittest.py \ + test/ganeti.utils.io_unittest-runasroot.py \ test/ganeti.utils.log_unittest.py \ test/ganeti.utils.mlock_unittest.py \ test/ganeti.utils.nodesetup_unittest.py \ @@ -848,17 +933,15 @@ python_tests = \ test/ganeti.utils.wrapper_unittest.py \ test/ganeti.utils.x509_unittest.py \ test/ganeti.utils_unittest.py \ + test/ganeti.vcluster_unittest.py \ test/ganeti.workerpool_unittest.py \ test/qa.qa_config_unittest.py \ test/cfgupgrade_unittest.py \ test/docs_unittest.py \ test/pycurl_reset_unittest.py \ test/tempfile_fork_unittest.py -if HAS_FAKEROOT -python_tests += test/ganeti.utils.io_unittest-runasroot.py -endif -haskell_tests = htools/test +haskell_tests = htest/test dist_TESTS = \ test/check-cert-expired_unittest.bash \ @@ -866,6 +949,7 @@ dist_TESTS = \ test/ganeti-cleaner_unittest.bash \ test/import-export_unittest.bash \ test/cli-test.bash \ + test/bash_completion.bash \ $(python_tests) nodist_TESTS = @@ -873,8 +957,8 @@ check_SCRIPTS = if WANT_HTOOLSTESTS nodist_TESTS += $(haskell_tests) -dist_TESTS += htools/offline-test.sh -check_SCRIPTS += htools/hpc-htools $(HS_BUILT_TEST_HELPERS) +dist_TESTS += htest/offline-test.sh +check_SCRIPTS += htest/hpc-htools $(HS_BUILT_TEST_HELPERS) endif TESTS = $(dist_TESTS) $(nodist_TESTS) @@ -918,10 +1002,11 @@ srclink_files = \ test/ganeti-cleaner_unittest.bash \ test/import-export_unittest.bash \ test/cli-test.bash \ - htools/offline-test.sh \ - htools/cli-tests-defs.sh \ + test/bash_completion.bash \ + htest/offline-test.sh \ + htest/cli-tests-defs.sh \ $(all_python_code) \ - $(HS_LIB_SRCS) $(HS_PROG_SRCS) + $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS) check_python_code = \ $(BUILD_BASH_COMPLETION) \ @@ -960,7 +1045,10 @@ pep8_python_code = \ test/daemon-util_unittest.bash: daemons/daemon-util -test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner +test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner \ + daemons/ganeti-master-cleaner + +test/bash_completion.bash: doc/examples/bash_completion-debug tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ @@ -970,19 +1058,26 @@ devel/upload: devel/upload.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod u+x $@ -daemons/%: daemons/%.in $(REPLACE_VARS_SED) +tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ -doc/examples/%: doc/examples/%.in $(REPLACE_VARS_SED) +daemons/%:: daemons/%.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ -doc/examples/hooks/%: doc/examples/hooks/%.in $(REPLACE_VARS_SED) +doc/examples/%:: doc/examples/%.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ -doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \ - lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin - PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@ +doc/examples/bash_completion: BC_ARGS = --compact +doc/examples/bash_completion-debug: BC_ARGS = + +doc/examples/bash_completion doc/examples/bash_completion-debug: \ + $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \ + lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \ + $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES) + PYTHONPATH=. $(RUN_IN_TEMPDIR) \ + $(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@ doc/%.png: doc/%.dot @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; } @@ -1030,21 +1125,12 @@ man/%.html.in: man/%.gen man/footer.html $(PANDOC) -s -f rst -t html -A man/footer.html $< | \ sed -e 's/\\@/@/g' > $@ -man/%.1: man/%.1.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - -man/%.7: man/%.7.in $(REPLACE_VARS_SED) +man/%: man/%.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ -man/%.8: man/%.8.in $(REPLACE_VARS_SED) +epydoc.conf: epydoc.conf.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ -man/%.html: man/%.html.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - -epydoc.conf: epydoc.conf.in Makefile - sed -e 's#@MODULES@#$(strip $(lint_python_code))#g' < $< > $@ - vcs-version: if test -d .git; then \ git describe > $@; \ @@ -1061,23 +1147,34 @@ regen-vcs-version: set -e; \ cd $(srcdir); \ if test -d .git; then \ - $(MAKE) clean-vcs-version; \ - $(MAKE) vcs-version; \ + $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \ + $(MAKE) $(AM_MAKEFLAGS) vcs-version; \ fi -htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version +htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \ + vcs-version $(built_base_sources) set -e; \ VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \ sed -e "s/%ver%/$$VCSVER/" < $< > $@ htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \ lib/constants.py lib/_autoconf.py lib/luxi.py \ - $(CONVERT_CONSTANTS) \ + $(CONVERT_CONSTANTS) $(built_base_sources) \ | lib/_vcsversion.py set -e; \ { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@ -lib/_autoconf.py: Makefile | lib/.dir +htest/Test/Ganeti/TestImports.hs: htest/Test/Ganeti/TestImports.hs.in \ + $(built_base_sources) + set -e; \ + { cat $< ; \ + echo ; \ + for name in $(filter-out Ganeti.THH,$(subst /,.,$(patsubst %.hs,%,$(patsubst htools/%,%,$(HS_LIB_SRCS))))) ; do \ + echo "import $$name ()" ; \ + done ; \ + } > $@ + +lib/_autoconf.py: Makefile | stamp-directories set -e; \ { echo '# This file is automatically generated, do not edit!'; \ echo '#'; \ @@ -1103,6 +1200,8 @@ lib/_autoconf.py: Makefile | lib/.dir echo "LOCALSTATEDIR = '$(localstatedir)'"; \ echo "SYSCONFDIR = '$(sysconfdir)'"; \ echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \ + echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \ + echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \ echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \ echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \ echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ @@ -1122,6 +1221,7 @@ lib/_autoconf.py: Makefile | lib/.dir echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \ echo "TOOLSDIR = '$(toolsdir)'"; \ echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \ + echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \ echo "PKGLIBDIR = '$(pkglibdir)'"; \ echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \ echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \ @@ -1144,12 +1244,11 @@ lib/_autoconf.py: Makefile | lib/.dir echo "HTOOLS = False"; \ fi; \ echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \ - echo "PY_CONFD = $(PY_CONFD)"; \ - echo "HS_CONFD = $(HS_CONFD)"; \ echo "XEN_CMD = '$(XEN_CMD)'"; \ + echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ } > $@ -lib/_vcsversion.py: Makefile vcs-version | lib/.dir +lib/_vcsversion.py: Makefile vcs-version | stamp-directories set -e; \ VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \ { echo '# This file is automatically generated, do not edit!'; \ @@ -1173,7 +1272,20 @@ lib/_vcsversion.py: Makefile vcs-version | lib/.dir lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC) PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@ -$(REPLACE_VARS_SED): Makefile +$(SHELL_ENV_INIT): Makefile stamp-directories + set -e; \ + { echo '# Allow overriding for tests'; \ + echo 'readonly LOCALSTATEDIR=$${LOCALSTATEDIR:-$${GANETI_ROOTDIR:-}$(localstatedir)}'; \ + echo 'readonly SYSCONFDIR=$${SYSCONFDIR:-$${GANETI_ROOTDIR:-}$(sysconfdir)}'; \ + echo; \ + echo 'readonly PKGLIBDIR=$(pkglibdir)'; \ + echo 'readonly LOG_DIR="$$LOCALSTATEDIR/log/ganeti"'; \ + echo 'readonly RUN_DIR="$$LOCALSTATEDIR/run/ganeti"'; \ + echo 'readonly DATA_DIR="$$LOCALSTATEDIR/lib/ganeti"'; \ + echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \ + } > $@ + +$(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories set -e; \ { echo 's#@PREFIX@#$(prefix)#g'; \ echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \ @@ -1199,6 +1311,13 @@ $(REPLACE_VARS_SED): Makefile echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \ + echo 's#@MODULES@#$(strip $(lint_python_code))#g'; \ + echo 's#@ENABLE_SPLIT_QUERY@#$(ENABLE_SPLIT_QUERY)#g'; \ + echo; \ + echo '/^@SHELL_ENV_INIT@$$/ {'; \ + echo ' r $(SHELL_ENV_INIT)'; \ + echo ' d'; \ + echo '}'; \ } > $@ # Using deferred evaluation @@ -1206,9 +1325,9 @@ daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@)) daemons/ganeti-watcher: MODULE = ganeti.watcher scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@)) tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs -$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/%,%,$@) +$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@) -$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles) +$(PYTHON_BOOTSTRAP): Makefile | stamp-directories test -n "$(MODULE)" || { echo Missing module; exit 1; } set -e; \ { echo '#!/usr/bin/python'; \ @@ -1242,13 +1361,18 @@ $(HS_BUILT_TEST_HELPERS): Makefile echo '# This file is automatically generated, do not edit!'; \ echo "# Edit Makefile.am instead."; \ echo; \ - echo "HTOOLS=$(TESTROLE) exec ./htools/hpc-htools \"\$$@\""; \ + echo "HTOOLS=$(TESTROLE) exec ./htest/hpc-htools \"\$$@\""; \ } > $@ chmod u+x $@ +stamp-directories: Makefile + $(MAKE) $(AM_MAKEFLAGS) ganeti + @mkdir_p@ $(DIRS) $(BUILDTIME_DIR_AUTOCREATE) + touch $@ + # We need to create symlinks because "make distcheck" will not install Python # files when building. -stamp-srclinks: Makefile | $(all_dirfiles) +stamp-srclinks: Makefile | stamp-directories set -e; \ for i in $(srclink_files); do \ if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \ @@ -1262,7 +1386,7 @@ ganeti: cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; } .PHONY: check-dirs -check-dirs: $(BUILT_SOURCES) +check-dirs: $(GENERATED_FILES) @set -e; \ find . -type d \( \( -name . \) -o \( \ -name .git -o \ @@ -1285,7 +1409,7 @@ check-dirs: $(BUILT_SOURCES) } .PHONY: check-local -check-local: check-dirs $(BUILT_SOURCES) +check-local: check-dirs $(GENERATED_FILES) $(CHECK_PYTHON_CODE) $(check_python_code) PYTHONPATH=. $(CHECK_HEADER) $(check_python_code) $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS @@ -1296,7 +1420,7 @@ check-local: check-dirs $(BUILT_SOURCES) echo "Incorrect version in README, expected $$expver"; \ exit 1; \ fi; \ - for file in doc/iallocator.rst doc/hooks.rst; do \ + for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst; do \ if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \ "Documents Ganeti version $$expver"; then \ echo "Incorrect version in $$file, expected $$expver"; \ @@ -1305,15 +1429,25 @@ check-local: check-dirs $(BUILT_SOURCES) done .PHONY: hs-check -hs-check: htools/test htools/hpc-htools $(HS_BUILT_TEST_HELPERS) +hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS) @rm -f test.tix - ./htools/test - HBINARY="./htools/hpc-htools" ./htools/offline-test.sh + ./htest/test + HBINARY="./htest/hpc-htools" ./htest/offline-test.sh # E111: indentation is not a multiple of four +# E121: continuation line indentation is not a multiple of four +# (since our indent level is not 4) +# E125: continuation line does not distinguish itself from next logical line +# (since our indent level is not 4) +# E127: continuation line over-indented for visual indent +# (since our indent level is not 4) +# note: do NOT add E128 here; it's a valid style error in most cases! +# I've seen real errors, but also some cases were we indent wrongly +# due to line length; try to rework the cases where it is triggered, +# instead of silencing it # E261: at least two spaces before inline comment # E501: line too long (80 characters) -PEP8_IGNORE = E111,E261,E501 +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)))) @@ -1330,23 +1464,24 @@ endif lint: $(LINT_TARGETS) .PHONY: pylint -pylint: $(BUILT_SOURCES) +pylint: $(GENERATED_FILES) @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; } $(PYLINT) $(LINT_OPTS) $(lint_python_code) .PHONY: pylint-qa -pylint-qa: $(BUILT_SOURCES) +pylint-qa: $(GENERATED_FILES) @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; } cd $(top_srcdir)/qa && \ PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \ --rcfile ../pylintrc $(patsubst qa/%.py,%,$(qa_scripts)) .PHONY: pep8 -pep8: $(BUILT_SOURCES) +pep8: $(GENERATED_FILES) @test -n "$(PEP8)" || { echo 'pep8' not found during configure; exit 1; } $(PEP8) --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \ --repeat $(pep8_python_code) +# FIXME: remove ignore "Use void" when GHC 6.x is deprecated .PHONY: hlint hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs @test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; } @@ -1356,13 +1491,15 @@ hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs --ignore "Use comparing" \ --ignore "Use on" \ --ignore "Reduce duplication" \ + --ignore "Use &&&" \ + --ignore "Use void" \ --hint htools/lint-hints \ - $(filter-out htools/Ganeti/THH.hs,$(HS_LIB_SRCS)) + $(filter-out htools/Ganeti/THH.hs,$(HS_LIBTEST_SRCS)) # a dist hook rule for updating the vcs-version file; this is # hardcoded due to where it needs to build the file... dist-hook: - $(MAKE) regen-vcs-version + $(MAKE) $(AM_MAKEFLAGS) regen-vcs-version rm -f $(top_distdir)/vcs-version cp -p $(srcdir)/vcs-version $(top_distdir) @@ -1399,6 +1536,19 @@ distcheck-hook: distcheck-release dist-release: export BUILD_RELEASE = 1 distcheck-release: distcheck +distrebuildcheck: dist + set -e; \ + builddir=$$(mktemp -d $(abs_srcdir)/distrebuildcheck.XXXXXXX); \ + trap "echo Removing $$builddir; cd $(abs_srcdir); rm -rf $$builddir" EXIT; \ + cd $$builddir; \ + tar xzf $(abs_srcdir)/$(distdir).tar.gz; \ + cd $(distdir); \ + ./configure; \ + $(MAKE) maintainer-clean; \ + cp $(abs_srcdir)/vcs-version .; \ + ./configure; \ + $(MAKE) $(AM_MAKEFLAGS) + dist-release: dist set -e; \ for i in $(DIST_ARCHIVES); do \ @@ -1412,11 +1562,6 @@ install-exec-local: "$(DESTDIR)${localstatedir}/log/ganeti" \ "$(DESTDIR)${localstatedir}/run/ganeti" -# To avoid conflicts between directory names and other targets, a file inside -# the directory is used to ensure its existence. -%.dir: - @mkdir_p@ $* && touch $@ - .PHONY: apidoc if WANT_HTOOLSAPIDOC apidoc: py-apidoc hs-apidoc @@ -1425,7 +1570,7 @@ apidoc: py-apidoc endif .PHONY: py-apidoc -py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES) +py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES) $(RUN_IN_TEMPDIR) epydoc -v \ --conf $(CURDIR)/epydoc.conf \ --output $(CURDIR)/$(APIDOC_PY_DIR) @@ -1439,6 +1584,7 @@ hs-apidoc: $(HS_BUILT_SRCS) rm -rf $(APIDOC_HS_DIR)/* @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd + @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/Confd/hscolour.css @@ -1451,7 +1597,7 @@ hs-apidoc: $(HS_BUILT_SRCS) if [ "$(HTOOLS_PARALLEL3)" ]; \ then OPTGHC="$$OPTGHC --optghc=$(HTOOLS_PARALLEL3)"; \ fi; \ - RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(HS_BUILT_SRCS:htools/%=%)"; \ + RELSRCS="$(HS_LIB_SRCS:htools/%=%) $(patsubst htools/%,%,$(filter htools/%,$(HS_BUILT_SRCS)))"; \ for file in $$RELSRCS; do \ hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \ $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \ @@ -1464,9 +1610,9 @@ hs-apidoc: $(HS_BUILT_SRCS) $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:htools/%=%)) .PHONY: TAGS -TAGS: $(BUILT_SOURCES) +TAGS: $(GENERATED_FILES) rm -f TAGS - $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIB_SRCS) + $(GHC) -e ":etags" -v0 $(HFLAGS) $(HS_LIBTEST_SRCS) find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \ -path './daemons/ganeti-*' -o -path './tools/*' -o \ -path './qa/*.py' | \ @@ -1480,7 +1626,7 @@ coverage: py-coverage endif .PHONY: py-coverage -py-coverage: $(BUILT_SOURCES) $(python_tests) +py-coverage: $(GENERATED_FILES) $(python_tests) set -e; \ COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \ TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \ @@ -1489,11 +1635,12 @@ py-coverage: $(BUILT_SOURCES) $(python_tests) $(python_tests) .PHONY: hs-coverage -hs-coverage: $(haskell_tests) htools/hpc-htools +hs-coverage: $(haskell_tests) htest/hpc-htools rm -f *.tix - $(MAKE) hs-check + $(MAKE) $(AM_MAKEFLAGS) hs-check @mkdir_p@ $(COVERAGE_HS_DIR) - hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix + hpc combine --union $(HPCEXCL) \ + test.tix hpc-htools.tix > coverage-htools.tix hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix hpc report coverage-htools.tix $(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html @@ -1516,6 +1663,21 @@ live-test: all commit-check: distcheck lint apidoc +.PHONY: gitignore-check +gitignore-check: + @if [ -n "`git status --short`" ]; then \ + echo "Git status is not clean!" 1>&2 ; \ + git status --short; \ + exit 1; \ + fi + +# we don't need the ancient implicit rules: +%: %,v +%: RCS/%,v +%: RCS/% +%: s.% +%: SCCS/s.% + -include ./Makefile.local # vim: set noet :