X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/41806ef480590e05b337694719cf083faee1a0f8..aee9a8a08e25eb70086eaa7f3eb63e88e62f2ffb:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca4da82..5831bb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ DIRS = \
 	qa \
 	test \
 	test/data \
+	test/data/bdev-rbd \
 	test/data/ovfdata \
 	test/data/ovfdata/other \
 	test/py \
@@ -260,8 +261,8 @@ pkgpython_PYTHON = \
 	lib/mcpu.py \
 	lib/netutils.py \
 	lib/objects.py \
-	lib/objectutils.py \
 	lib/opcodes.py \
+	lib/outils.py \
 	lib/ovf.py \
 	lib/pathutils.py \
 	lib/qlang.py \
@@ -340,6 +341,7 @@ server_PYTHON = \
 
 pytools_PYTHON = \
 	lib/tools/__init__.py \
+	lib/tools/burnin.py \
 	lib/tools/ensure_dirs.py \
 	lib/tools/node_cleanup.py \
 	lib/tools/node_daemon_setup.py \
@@ -393,8 +395,8 @@ docinput = \
 	doc/design-partitioned.rst \
 	doc/design-query-splitting.rst \
 	doc/design-query2.rst \
-	doc/design-remote-commands.rst \
 	doc/design-resource-model.rst \
+	doc/design-restricted-commands.rst \
 	doc/design-shared-storage.rst \
 	doc/design-monitoring-agent.rst \
 	doc/design-virtual-clusters.rst \
@@ -486,6 +488,7 @@ HS_LIB_SRCS = \
 	src/Ganeti/DataCollectors/CLI.hs \
 	src/Ganeti/DataCollectors/Drbd.hs \
 	src/Ganeti/DataCollectors/Program.hs \
+	src/Ganeti/DataCollectors/Types.hs \
 	src/Ganeti/Errors.hs \
 	src/Ganeti/HTools/Backend/IAlloc.hs \
 	src/Ganeti/HTools/Backend/Luxi.hs \
@@ -570,6 +573,7 @@ HS_TEST_SRCS = \
 	test/hs/Test/Ganeti/Query/Language.hs \
 	test/hs/Test/Ganeti/Query/Query.hs \
 	test/hs/Test/Ganeti/Rpc.hs \
+	test/hs/Test/Ganeti/Runtime.hs \
 	test/hs/Test/Ganeti/Ssconf.hs \
 	test/hs/Test/Ganeti/THH.hs \
 	test/hs/Test/Ganeti/TestCommon.hs \
@@ -610,10 +614,16 @@ if !MANPAGES_IN_DOC
 	  exit 1; \
 	fi
 endif
+## Sphinx provides little control over what content should be included. Some
+## mechanisms exist, but they all have drawbacks or actual issues. Since we
+## build two different versions of the documentation--once without man pages and
+## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+## us with this, but requires running in a temporary directory. It moves the
+## correct files into place depending on environment variables.
 	dir=$(dir $@) && \
 	@mkdir_p@ $$dir && \
-	PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) \
-	$(RUN_IN_TEMPDIR) bash autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
+	PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+	$(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
 	    -d . \
 	    -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
 	    -D release="$(PACKAGE_VERSION)" \
@@ -701,6 +711,7 @@ PYTHON_BOOTSTRAP_SBIN = \
 
 PYTHON_BOOTSTRAP = \
 	$(PYTHON_BOOTSTRAP_SBIN) \
+	tools/burnin \
 	tools/ensure-dirs \
 	tools/node-cleanup \
 	tools/node-daemon-setup \
@@ -799,7 +810,6 @@ nodist_sbin_SCRIPTS += src/ganeti-confd
 endif
 
 python_scripts = \
-	tools/burnin \
 	tools/cfgshell \
 	tools/cfgupgrade \
 	tools/cfgupgrade12 \
@@ -829,6 +839,7 @@ pkglib_python_scripts = \
 	tools/check-cert-expired
 
 nodist_pkglib_python_scripts = \
+	tools/burnin \
 	tools/ensure-dirs \
 	tools/node-daemon-setup \
 	tools/prepare-node-join
@@ -929,7 +940,10 @@ man_MANS = \
 	man/htools.1 \
 	man/mon-collector.7
 
-manrst = $(patsubst %.1,%.rst,$(patsubst %.7,%.rst,$(patsubst %.8,%.rst,$(man_MANS))))
+# Remove extensions from all filenames in man_MANS
+mannoext = $(patsubst %.1,%,$(patsubst %.7,%,$(patsubst %.8,%,$(man_MANS))))
+
+manrst = $(patsubst %,%.rst,$(mannoext))
 manhtml = $(patsubst %.rst,%.html,$(manrst))
 mangen = $(patsubst %.rst,%.gen,$(manrst))
 maninput = \
@@ -973,6 +987,18 @@ TEST_FILES = \
 	test/data/bdev-drbd-disk.txt \
 	test/data/bdev-drbd-net-ip4.txt \
 	test/data/bdev-drbd-net-ip6.txt \
+	test/data/bdev-rbd/json_output_empty.txt \
+	test/data/bdev-rbd/json_output_extra_matches.txt \
+	test/data/bdev-rbd/json_output_no_matches.txt \
+	test/data/bdev-rbd/json_output_ok.txt \
+	test/data/bdev-rbd/plain_output_new_extra_matches.txt \
+	test/data/bdev-rbd/plain_output_new_no_matches.txt \
+	test/data/bdev-rbd/plain_output_new_ok.txt \
+	test/data/bdev-rbd/plain_output_old_empty.txt \
+	test/data/bdev-rbd/plain_output_old_extra_matches.txt \
+	test/data/bdev-rbd/plain_output_old_no_matches.txt \
+	test/data/bdev-rbd/plain_output_old_ok.txt \
+	test/data/bdev-rbd/output_invalid.txt \
 	test/data/cert1.pem \
 	test/data/cert2.pem \
 	test/data/instance-minor-pairing.txt \
@@ -1068,8 +1094,8 @@ python_tests = \
 	test/py/ganeti.mcpu_unittest.py \
 	test/py/ganeti.netutils_unittest.py \
 	test/py/ganeti.objects_unittest.py \
-	test/py/ganeti.objectutils_unittest.py \
 	test/py/ganeti.opcodes_unittest.py \
+	test/py/ganeti.outils_unittest.py \
 	test/py/ganeti.ovf_unittest.py \
 	test/py/ganeti.qlang_unittest.py \
 	test/py/ganeti.query_unittest.py \
@@ -1085,6 +1111,7 @@ python_tests = \
 	test/py/ganeti.ssconf_unittest.py \
 	test/py/ganeti.ssh_unittest.py \
 	test/py/ganeti.storage_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 \
 	test/py/ganeti.tools.prepare_node_join_unittest.py \
@@ -1368,6 +1395,7 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
 	  echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \
 	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
+	  echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \
 	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
 	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
 	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
@@ -1407,6 +1435,13 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
 	  echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
 	  echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
+## Write dictionary with man page name as the key and the section number as the
+## value
+	  echo "MAN_PAGES = {"; \
+	  for i in $(notdir $(man_MANS)); do \
+	    echo "$$i" | sed -re 's/^(.*)\.([0-9]+)$$/  "\1": \2,/g'; \
+	  done; \
+	  echo "}"; \
 	} > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1446,35 +1481,38 @@ $(SHELL_ENV_INIT): Makefile stamp-directories
 	  echo 'readonly CONF_DIR="$$SYSCONFDIR/ganeti"'; \
 	} > $@
 
+## Writes sed script to replace placeholders with build-time values. The
+## additional quotes after the first @ sign are necessary to stop configure
+## from replacing those values as well.
 $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 	set -e; \
-	{ 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#@LIBDIR@#$(libdir)#g'; \
-	  echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
-	  echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
-	  echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
-	  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#@GNTMASTERUSER@#$(MASTERD_USER)#g'; \
-	  echo 's#@GNTRAPIUSER@#$(RAPI_USER)#g'; \
-	  echo 's#@GNTCONFDUSER@#$(CONFD_USER)#g'; \
-	  echo 's#@GNTNODEDUSER@#$(NODED_USER)#g'; \
-	  echo 's#@GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
-	  echo 's#@GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
-	  echo 's#@GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
-	  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 '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#@''LIBDIR@#$(libdir)#g'; \
+	  echo 's#@''GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+	  echo 's#@''CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
+	  echo 's#@''CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
+	  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#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+	  echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
+	  echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+	  echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
+	  echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
+	  echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+	  echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+	  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#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \
 	  echo; \
 	  echo '/^@SHELL_ENV_INIT@$$/ {'; \
 	  echo '  r $(SHELL_ENV_INIT)'; \
@@ -1486,6 +1524,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
 daemons/ganeti-watcher: MODULE = ganeti.watcher
 scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
+tools/burnin: MODULE = ganeti.tools.burnin
 tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
 tools/node-daemon-setup: MODULE = ganeti.tools.node_daemon_setup
 tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
@@ -1673,6 +1712,7 @@ HLINT_EXCLUDES = src/Ganeti/THH.hs test/hs/hpc-htools.hs
 .PHONY: hlint
 hlint: $(HS_BUILT_SRCS) src/lint-hints.hs
 	@test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
+	@rm -f doc/hs-lint.html
 	if tty -s; then C="-c"; else C=""; fi; \
 	$(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
 	  --ignore "Use first" \
@@ -1681,6 +1721,9 @@ hlint: $(HS_BUILT_SRCS) src/lint-hints.hs
 	  --ignore "Reduce duplication" \
 	  --hint src/lint-hints \
 	  $(filter-out $(HLINT_EXCLUDES),$(HS_LIBTEST_SRCS) $(HS_PROG_SRCS))
+	@if [ ! -f doc/hs-lint.html ]; then \
+	  echo "All good" > doc/hs-lint.html; \
+	fi
 
 # a dist hook rule for updating the vcs-version file; this is
 # hardcoded due to where it needs to build the file...
@@ -1688,11 +1731,6 @@ dist-hook:
 	$(MAKE) $(AM_MAKEFLAGS) regen-vcs-version
 	rm -f $(top_distdir)/vcs-version
 	cp -p $(srcdir)/vcs-version $(top_distdir)
-if MANPAGES_IN_DOC
-	echo 'Building distribution with man pages included in documentation is' \
-	     'not allowed as they can contain fixed paths' >&2; \
-	exit 1
-endif
 
 # a distcheck hook rule for catching revision control directories
 distcheck-hook:
@@ -1722,6 +1760,10 @@ distcheck-hook:
 	   echo "Found unreleased version in NEWS." >&2; \
 	   exit 1; \
 	fi
+	if test -e $(top_distdir)/doc/man-html; then \
+	  echo "Found documentation including man pages in final archive" >&2; \
+	  exit 1; \
+	fi
 
 # When building a release, stricter checks should be used
 distcheck-release dist-release: export BUILD_RELEASE = 1