Add general storage parameters to node info call

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a127267..7d0f87c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,12 +76,14 @@ HS_DIRS = \
        src/Ganeti/Storage \
        src/Ganeti/Storage/Diskstats \
        src/Ganeti/Storage/Drbd \
+       src/Ganeti/Storage/Lvm \
        test/hs \
        test/hs/Test \
        test/hs/Test/Ganeti \
        test/hs/Test/Ganeti/Storage \
        test/hs/Test/Ganeti/Storage/Diskstats \
        test/hs/Test/Ganeti/Storage/Drbd \
+       test/hs/Test/Ganeti/Storage/Lvm \
        test/hs/Test/Ganeti/Confd \
        test/hs/Test/Ganeti/HTools \
        test/hs/Test/Ganeti/HTools/Backend \
@@ -197,6 +199,8 @@ CLEANFILES = \
        $(man_MANS) \
        $(manhtml) \
        tools/kvm-ifup \
+       tools/vif-ganeti \
+       tools/net-common \
        tools/users-setup \
        tools/vcluster-setup \
        stamp-directories \
@@ -549,6 +553,7 @@ HS_LIB_SRCS = \
        src/Ganeti/DataCollectors/Drbd.hs \
        src/Ganeti/DataCollectors/InstStatus.hs \
        src/Ganeti/DataCollectors/InstStatusTypes.hs \
+       src/Ganeti/DataCollectors/Lv.hs \
        src/Ganeti/DataCollectors/Program.hs \
        src/Ganeti/DataCollectors/Types.hs \
        src/Ganeti/Errors.hs \
@@ -612,6 +617,8 @@ HS_LIB_SRCS = \
        src/Ganeti/Storage/Diskstats/Types.hs \
        src/Ganeti/Storage/Drbd/Parser.hs \
        src/Ganeti/Storage/Drbd/Types.hs \
+       src/Ganeti/Storage/Lvm/LVParser.hs \
+       src/Ganeti/Storage/Lvm/Types.hs \
        src/Ganeti/Storage/Utils.hs \
        src/Ganeti/THH.hs \
        src/Ganeti/Types.hs \
@@ -654,6 +661,7 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs \
        test/hs/Test/Ganeti/Storage/Drbd/Parser.hs \
        test/hs/Test/Ganeti/Storage/Drbd/Types.hs \
+       test/hs/Test/Ganeti/Storage/Lvm/LVParser.hs \
        test/hs/Test/Ganeti/THH.hs \
        test/hs/Test/Ganeti/TestCommon.hs \
        test/hs/Test/Ganeti/TestHTools.hs \
@@ -938,6 +946,8 @@ nodist_pkglib_python_scripts = \
 myexeclib_SCRIPTS = \
        daemons/daemon-util \
        tools/kvm-ifup \
+       tools/vif-ganeti \
+       tools/net-common \
        $(pkglib_python_scripts) \
        $(HS_MYEXECLIB_PROGS)
 
@@ -973,6 +983,8 @@ EXTRA_DIST = \
        devel/upload \
        devel/webserver \
        tools/kvm-ifup.in \
+       tools/vif-ganeti.in \
+       tools/net-common.in \
        tools/users-setup.in \
        tools/vcluster-setup.in \
        $(docinput) \
@@ -1068,6 +1080,7 @@ TEST_FILES = \
        test/data/htools/hspace-tiered-ipolicy.data \
        test/data/htools/hspace-tiered-mixed.data \
        test/data/htools/hspace-tiered-resourcetypes.data \
+       test/data/htools/hspace-tiered-vcpu.data \
        test/data/htools/hspace-tiered.data \
        test/data/htools/invalid-node.data \
        test/data/htools/missing-resources.data \
@@ -1078,6 +1091,7 @@ TEST_FILES = \
        test/data/htools/rapi/info.json \
        test/data/htools/rapi/instances.json \
        test/data/htools/rapi/nodes.json \
+       test/data/htools/hroller-full.data \
        test/data/htools/hroller-nodegroups.data \
        test/data/htools/hroller-nonredundant.data \
        test/data/htools/hroller-online.data \
@@ -1132,6 +1146,7 @@ TEST_FILES = \
        test/data/kvm_0.9.1_help_boot_test.txt \
        test/data/kvm_1.0_help.txt \
        test/data/kvm_1.1.2_help.txt \
+       test/data/lvs_lv.txt \
        test/data/NEWS_OK.txt \
        test/data/NEWS_previous_unreleased.txt \
        test/data/ovfdata/compr_disk.vmdk.gz \
@@ -1395,6 +1410,14 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
+tools/vif-ganeti: tools/vif-ganeti.in $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
+       chmod +x $@
+
+tools/net-common: tools/net-common.in $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
+       chmod +x $@
+
 tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@