Test with non-redundant instances and several node-groups

The example cluster contains two node groups. The first contains three nodes,
with two non-redundant instances each. As each node has only capacity for three
instances, the nodes have to be rebooted individually. Additionally, there is
a separate node-group with additional of capacity, which, however, cannot be used,
as instances are supposed to be moved within a node-group only.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/Makefile.am b/Makefile.am
index 5e9b09f..2297e91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1062,6 +1062,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-nodegroups.data \
        test/data/htools/hroller-nonredundant.data \
        test/data/htools/hroller-online.data \
        test/data/htools/unique-reboot-order.data \

diff --git a/test/data/htools/hroller-nodegroups.data b/test/data/htools/hroller-nodegroups.data
new file mode 100644 (file)
index 0000000..db8f9ee
--- /dev/null
+++ b/test/data/htools/hroller-nodegroups.data
@@ -0,0 +1,18 @@
+group-01|fake-uuid-01|preferred|
+group-02|fake-uuid-02|preferred|
+
+node-01-000|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
+node-01-001|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
+node-01-002|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
+node-02-000|91552|0|91552|3100|3100|16|M|fake-uuid-02|1
+
+inst-00|128|1024|1|running|Y|node-01-000||plain||1
+inst-01|128|1024|1|running|Y|node-01-000||plain||1
+inst-10|128|1024|1|running|Y|node-01-001||plain||1
+inst-11|128|1024|1|running|Y|node-01-001||plain||1
+inst-20|128|1024|1|running|Y|node-01-002||plain||1
+inst-21|128|1024|1|running|Y|node-01-002||plain||1
+
+|128,1,1024,1,1,1|128,1,1024,1,1,1;32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd,ext|4.0|32.0
+group-01|128,1,1024,1,1,1|128,1,1024,1,1,1;32768,8,1048576,16,8,12|diskless,file,sharedfile,plain,blockdev,drbd,rbd,ext|4.0|32.0
+

diff --git a/test/hs/shelltests/htools-hroller.test b/test/hs/shelltests/htools-hroller.test
index 09bcd34..e7b4e7f 100644 (file)
--- a/test/hs/shelltests/htools-hroller.test
+++ b/test/hs/shelltests/htools-hroller.test
@@ -60,3 +60,9 @@ Error: Cannot create node graph
 >>>/^node-01-00.,node-01-00.,node-01-00.,node-01-00.,node-01-00.,node-01-000$/
 >>>= 0
 
+
+./test/hs/hroller --no-headers -t $TESTDATA_DIR/hroller-nodegroups.data
+>>>/^node-01-00.
+node-01-00.
+node-01-00.,node-02-000$/
+>>>= 0