X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3039e2dce4fa3d2d9875538617cbcb2a2c0f9c1f..a25f44a4edb69accf1f1914baeed9c80cd8d3706:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6bfa4b8..87d51c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,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
@@ -57,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:
@@ -68,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 \
@@ -135,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 = \
@@ -240,7 +266,8 @@ built_base_sources = \
 
 built_python_base_sources = \
 	lib/_autoconf.py \
-	lib/_vcsversion.py
+	lib/_vcsversion.py \
+	lib/opcodes.py
 
 BUILT_PYTHON_SOURCES = \
 	$(built_python_base_sources) \
@@ -255,6 +282,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 \
@@ -288,7 +316,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 \
@@ -441,6 +469,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 \
@@ -453,6 +482,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 \
@@ -465,6 +495,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 \
@@ -474,6 +505,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 \
@@ -501,6 +533,7 @@ 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
@@ -553,9 +586,12 @@ HS_LIB_SRCS = \
 	src/Ganeti/Confd/Utils.hs \
 	src/Ganeti/Config.hs \
 	src/Ganeti/ConfigReader.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 \
@@ -594,6 +630,8 @@ HS_LIB_SRCS = \
 	src/Ganeti/Hypervisor/Xen/XmParser.hs \
 	src/Ganeti/Hypervisor/Xen/Types.hs \
 	src/Ganeti/Hash.hs \
+	src/Ganeti/Hs2Py/GenOpCodes.hs \
+	src/Ganeti/Hs2Py/OpDoc.hs \
 	src/Ganeti/JQueue.hs \
 	src/Ganeti/JSON.hs \
 	src/Ganeti/Jobs.hs \
@@ -605,6 +643,7 @@ HS_LIB_SRCS = \
 	src/Ganeti/OpCodes.hs \
 	src/Ganeti/OpParams.hs \
 	src/Ganeti/Path.hs \
+	src/Ganeti/Parsers.hs \
 	src/Ganeti/Query/Cluster.hs \
 	src/Ganeti/Query/Common.hs \
 	src/Ganeti/Query/Export.hs \
@@ -685,7 +724,9 @@ HS_BUILT_SRCS = \
 	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/opcodes.py.in_after \
+	lib/opcodes.py.in_before
 
 HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS)
 
@@ -702,9 +743,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
@@ -779,14 +820,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 = \
@@ -903,6 +947,11 @@ 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 $< $@
@@ -962,6 +1011,11 @@ myexeclib_SCRIPTS = \
 	$(pkglib_python_scripts) \
 	$(HS_MYEXECLIB_PROGS)
 
+# strip path prefixes off the sbin scripts
+all_myexeclib_scripts = \
+	$(patsubst tools/%,%,$(patsubst daemons/%,%,\
+	$(patsubst src/%,%,$(myexeclib_SCRIPTS))))
+
 nodist_myexeclib_SCRIPTS = \
 	$(nodist_pkglib_python_scripts)
 
@@ -970,6 +1024,7 @@ EXTRA_DIST = \
 	UPGRADE \
 	epydoc.conf.in \
 	pylintrc \
+	pylintrc-test \
 	autotools/build-bash-completion \
 	autotools/build-rpc \
 	autotools/check-header \
@@ -1007,11 +1062,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) \
@@ -1069,6 +1122,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 \
@@ -1145,6 +1202,7 @@ 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 \
@@ -1217,6 +1275,12 @@ 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 \
@@ -1227,9 +1291,6 @@ python_tests = \
 	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.cmdlib.cluster_unittest.py \
-	test/py/ganeti.cmdlib.instance_storage_unittest.py \
 	test/py/ganeti.compat_unittest.py \
 	test/py/ganeti.confd.client_unittest.py \
 	test/py/ganeti.config_unittest.py \
@@ -1302,6 +1363,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 = \
@@ -1332,7 +1410,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)
@@ -1366,6 +1444,7 @@ all_python_code = \
 
 if PY_UNIT
 all_python_code += $(python_tests)
+all_python_code += $(python_test_support)
 endif
 
 srclink_files = \
@@ -1415,7 +1494,8 @@ pep8_python_code = \
 	$(CHECK_HEADER) \
 	$(DOCPP) \
 	$(PYTHON_BOOTSTRAP) \
-	qa
+	qa \
+	$(python_test_support)
 
 test/py/daemon-util_unittest.bash: daemons/daemon-util
 
@@ -1588,7 +1668,6 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
 	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
 	  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)'"; \
@@ -1655,6 +1734,13 @@ lib/_vcsversion.py: Makefile vcs-version | stamp-directories
 	  echo "VCS_VERSION = '$$VCSVER'"; \
 	} > $@
 
+lib/opcodes.py: Makefile src/hs2py src/Ganeti/Constants.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 > $@
 
@@ -1679,8 +1765,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'; \
@@ -1689,7 +1775,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 	  echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
 	  echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_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'; \
@@ -1889,7 +1975,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
@@ -1911,6 +1997,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)
@@ -1999,6 +2091,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
@@ -2094,7 +2209,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