projects / ganeti-local / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use TemplateHaskell to create LUXI operations
[ganeti-local] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 3f67337..3d855aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
 CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
+CHECK_IMPORTS = $(top_srcdir)/autotools/check-imports
 DOCPP = $(top_srcdir)/autotools/docpp
 REPLACE_VARS_SED = autotools/replace_vars.sed
 CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
@@ -80,6 +81,8 @@ DIRS = \
        qa \
        test \
        test/data \
+       test/data/ovfdata \
+       test/data/ovfdata/other \
        tools
 
 BUILDTIME_DIR_AUTOCREATE = \
@@ -192,6 +195,7 @@ pkgpython_PYTHON = \
        lib/netutils.py \
        lib/objects.py \
        lib/opcodes.py \
+       lib/ovf.py \
        lib/qlang.py \
        lib/query.py \
        lib/rpc.py \
@@ -304,6 +308,7 @@ docrst = \
        doc/design-ovf-support.rst \
        doc/cluster-merge.rst \
        doc/design-shared-storage.rst \
+       doc/design-node-state-cache.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \
@@ -329,8 +334,11 @@ HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
 # extra flags that can be overriden on the command line
 HEXTRA =
 # exclude options for coverage reports
-HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC \
+HPCEXCL = --exclude Main \
        --exclude Ganeti.Constants \
+       --exclude Ganeti.THH \
+       --exclude Ganeti.HTools.QC \
+       --exclude Ganeti.HTools.QCHelper \
        --exclude Ganeti.HTools.Version
 
 HS_LIB_SRCS = \
@@ -342,11 +350,13 @@ HS_LIB_SRCS = \
        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 \
@@ -358,7 +368,8 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Program/Hspace.hs \
        htools/Ganeti/Jobs.hs \
        htools/Ganeti/Luxi.hs \
-       htools/Ganeti/OpCodes.hs
+       htools/Ganeti/OpCodes.hs \
+       htools/Ganeti/THH.hs
 
 HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
@@ -454,6 +465,7 @@ qa_scripts = \
        qa/qa_daemon.py \
        qa/qa_env.py \
        qa/qa_error.py \
+       qa/qa_group.py \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
@@ -510,6 +522,7 @@ dist_tools_PYTHON = \
        tools/cluster-merge \
        tools/lvmstrap \
        tools/move-instance \
+       tools/ovfconverter \
        tools/setup-ssh \
        tools/sanitize-config
 
@@ -540,6 +553,7 @@ EXTRA_DIST = \
        pylintrc \
        autotools/build-bash-completion \
        autotools/check-python-code \
+       autotools/check-imports \
        autotools/check-man \
        autotools/check-news \
        autotools/check-tar \
@@ -634,6 +648,31 @@ TEST_FILES = \
        test/data/proc_drbd83_sync.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
        test/data/sys_drbd_usermode_helper.txt \
+       test/data/ovfdata/compr_disk.vmdk.gz \
+       test/data/ovfdata/config.ini \
+       test/data/ovfdata/corrupted_resources.ovf \
+       test/data/ovfdata/empty.ini \
+       test/data/ovfdata/empty.ovf \
+       test/data/ovfdata/ganeti.mf \
+       test/data/ovfdata/ganeti.ovf \
+       test/data/ovfdata/gzip_disk.ovf \
+       test/data/ovfdata/new_disk.vmdk \
+       test/data/ovfdata/no_disk.ini \
+       test/data/ovfdata/no_disk_in_ref.ovf \
+       test/data/ovfdata/no_os.ini \
+       test/data/ovfdata/no_ovf.ova \
+       test/data/ovfdata/ova.ova \
+       test/data/ovfdata/second_disk.vmdk \
+       test/data/ovfdata/rawdisk.raw \
+       test/data/ovfdata/unsafe_path.ini \
+       test/data/ovfdata/virtualbox.ovf \
+       test/data/ovfdata/wrong_extension.ovd \
+       test/data/ovfdata/wrong_config.ini \
+       test/data/ovfdata/wrong_manifest.mf \
+       test/data/ovfdata/wrong_manifest.ovf \
+       test/data/ovfdata/wrong_ova.ova \
+       test/data/ovfdata/wrong_xml.ovf \
+       test/data/ovfdata/other/rawdisk.raw \
        test/import-export_unittest-helper
 
 python_tests = \
@@ -668,6 +707,7 @@ python_tests = \
        test/ganeti.netutils_unittest.py \
        test/ganeti.objects_unittest.py \
        test/ganeti.opcodes_unittest.py \
+       test/ganeti.ovf_unittest.py \
        test/ganeti.qlang_unittest.py \
        test/ganeti.query_unittest.py \
        test/ganeti.rapi.baserlib_unittest.py \
@@ -754,6 +794,7 @@ srclink_files = \
 
 check_python_code = \
        $(BUILD_BASH_COMPLETION) \
+       $(CHECK_IMPORTS) \
        $(DOCPP) \
        $(all_python_code)
 
@@ -764,9 +805,25 @@ lint_python_code = \
        $(dist_tools_PYTHON) \
        $(pkglib_python_scripts) \
        $(BUILD_BASH_COMPLETION) \
+       $(CHECK_IMPORTS) \
        $(DOCPP) \
        $(PYTHON_BOOTSTRAP)
 
+standalone_python_modules = \
+       lib/rapi/client.py \
+       tools/ganeti-listrunner
+
+pep8_python_code = \
+       ganeti \
+       ganeti/http/server.py \
+       $(dist_sbin_SCRIPTS) \
+       $(dist_tools_PYTHON) \
+       $(pkglib_python_scripts) \
+       $(BUILD_BASH_COMPLETION) \
+       $(DOCPP) \
+       $(PYTHON_BOOTSTRAP) \
+       qa
+
 test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
@@ -879,7 +936,7 @@ lib/_autoconf.py: Makefile | lib/.dir
          echo ''; \
          echo '"""'; \
          echo ''; \
-         echo '# pylint: disable-msg=C0301,C0324'; \
+         echo '# pylint: disable=C0301,C0324'; \
          echo '# because this is autogenerated, we do not want'; \
          echo '# style warnings' ; \
          echo ''; \
@@ -945,7 +1002,7 @@ lib/_vcsversion.py: Makefile vcs-version | lib/.dir
          echo ''; \
          echo '"""'; \
          echo ''; \
-         echo '# pylint: disable-msg=C0301,C0324'; \
+         echo '# pylint: disable=C0301,C0324'; \
          echo '# because this is autogenerated, we do not want'; \
          echo '# style warnings' ; \
          echo ''; \
@@ -994,7 +1051,7 @@ $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
          echo; \
          echo '"""Bootstrap script for L{$(MODULE)}"""'; \
          echo; \
-         echo '# pylint: disable-msg=C0103'; \
+         echo '# pylint: disable=C0103'; \
          echo '# C0103: Invalid name'; \
          echo; \
          echo 'import sys'; \
@@ -1003,9 +1060,9 @@ $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
          echo '# Temporarily alias commands until bash completion'; \
          echo '# generator is changed'; \
          echo 'if hasattr(main, "commands"):'; \
-         echo '  commands = main.commands # pylint: disable-msg=E1101'; \
+         echo '  commands = main.commands # pylint: disable=E1101'; \
          echo 'if hasattr(main, "aliases"):'; \
-         echo '  aliases = main.aliases # pylint: disable-msg=E1101'; \
+         echo '  aliases = main.aliases # pylint: disable=E1101'; \
          echo; \
          echo 'if __name__ == "__main__":'; \
          echo '  sys.exit(main.Main())'; \
@@ -1050,10 +1107,12 @@ check-dirs: $(BUILT_SOURCES)
                if test -n "$$error"; then exit 1; else exit 0; fi; \
        }
 
-check-local: check-dirs
+.PHONY: check-local
+check-local: check-dirs $(BUILT_SOURCES)
        $(CHECK_PYTHON_CODE) $(check_python_code)
        $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
        $(CHECK_NEWS) < $(top_srcdir)/NEWS
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
        expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
        if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
                echo "Incorrect version in README, expected $$expver"; \
@@ -1061,7 +1120,7 @@ check-local: check-dirs
        fi; \
        for file in doc/iallocator.rst doc/hooks.rst; do \
                if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
-                       "Documents Ganeti version $$expver"; then \
+                       "Documents Ganeti version $$expver"; then \
                        echo "Incorrect version in $$file, expected $$expver"; \
                        exit 1; \
                fi; \
@@ -1087,7 +1146,7 @@ lint: $(BUILT_SOURCES)
                echo '"pep8" not found during configure' >&2; \
        else \
                $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
-                       $(lint_python_code); \
+                       $(pep8_python_code); \
        fi
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
        cd $(top_srcdir)/qa && \
@@ -1179,7 +1238,7 @@ hs-apidoc: $(HS_BUILT_SRCS)
        rm -rf $(APIDOC_HS_DIR)/*
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
        $(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/HTools/hscolour.css
        set -e ; \
        cd htools; \
        if [ "$(HTOOLS_NOCURL)" ]; \
@@ -1231,7 +1290,7 @@ hs-coverage: $(haskell_tests)
        @mkdir_p@ $(COVERAGE_HS_DIR)
        hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
        hpc report htools/test $(HPCEXCL)
-       ln -sf hpc_index.html $(COVERAGE_HS_DIR)/index.html
+       $(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all
 # tools compiled with -fhpc)
@@ -1239,7 +1298,7 @@ hs-coverage: $(haskell_tests)
 live-test: all
        set -e ; \
        cd htools; \
-       rm -f .hpc; ln -s ../.hpc .hpc; \
+       rm -f .hpc; $(LN_S) ../.hpc .hpc; \
        rm -f *.tix *.mix; \
        ./live-test.sh; \
        hpc sum --union $(HPCEXCL) $(addsuffix .tix,$(HS_PROGS:htools/%=%)) \
Unnamed repository; edit this file 'description' to name the repository.