Use TemplateHaskell to create LUXI operations

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fde2b66..3d855aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,8 @@ DIRS = \
        qa \
        test \
        test/data \
+       test/data/ovfdata \
+       test/data/ovfdata/other \
        tools
 
 BUILDTIME_DIR_AUTOCREATE = \
@@ -193,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 \
@@ -305,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 \
@@ -330,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 = \
@@ -343,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 \
@@ -359,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))
@@ -512,6 +522,7 @@ dist_tools_PYTHON = \
        tools/cluster-merge \
        tools/lvmstrap \
        tools/move-instance \
+       tools/ovfconverter \
        tools/setup-ssh \
        tools/sanitize-config
 
@@ -637,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 = \
@@ -671,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 \
@@ -1083,7 +1120,7 @@ check-local: check-dirs $(BUILT_SOURCES)
        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; \