Remove useless code in backend for network hooks

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b992c86..5831bb9 100644 (file)
--- 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 \
@@ -394,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 \
@@ -572,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 \
@@ -985,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 \
@@ -1080,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 \
@@ -1381,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)'"; \
@@ -1497,6 +1512,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
          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)'; \
@@ -1696,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" \
@@ -1704,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...