Revision 8840de6f

b/Makefile.am
1056 1056
	test/data/htools/rapi/info.json \
1057 1057
	test/data/htools/rapi/instances.json \
1058 1058
	test/data/htools/rapi/nodes.json \
1059
	test/data/htools/hroller-nonredundant.data \
1059 1060
	test/data/htools/hroller-online.data \
1060 1061
	test/data/htools/unique-reboot-order.data \
1061 1062
	test/hs/shelltests/htools-balancing.test \
b/test/data/htools/hroller-nonredundant.data
1
group-01|fake-uuid-01|preferred|
2

  
3
node-01-000|91552|0|91424|3100|1052|16|M|fake-uuid-01|1
4
node-01-001|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
5
node-01-002|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
6
node-01-003|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
7
node-01-004|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
8
node-01-005|91552|0|91424|3100|1052|16|N|fake-uuid-01|1
9

  
10
inst-00|128|1024|1|running|Y|node-01-000||plain||1
11
inst-01|128|1024|1|running|Y|node-01-000||plain||1
12
inst-10|128|1024|1|running|Y|node-01-001||plain||1
13
inst-11|128|1024|1|running|Y|node-01-001||plain||1
14
inst-20|128|1024|1|running|Y|node-01-002||plain||1
15
inst-21|128|1024|1|running|Y|node-01-002||plain||1
16
inst-30|128|1024|1|running|Y|node-01-003||plain||1
17
inst-31|128|1024|1|running|Y|node-01-003||plain||1
18
inst-40|128|1024|1|running|Y|node-01-004||plain||1
19
inst-41|128|1024|1|running|Y|node-01-004||plain||1
20
inst-50|128|1024|1|running|Y|node-01-005||plain||1
21
inst-51|128|1024|1|running|Y|node-01-005||plain||1
22

  
23
|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
24
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
25

  
b/test/hs/shelltests/htools-hroller.test
34 34
node-01-003/
35 35
>>>= 0
36 36

  
37
./test/hs/hroller --no-headers -t $TESTDATA_DIR/hroller-nonredundant.data
38
>>>/^node-01-00.,node-01-00.
39
node-01-00.,node-01-00.
40
node-01-00.,node-01-000$/
41
>>>= 0
42

  
43
./test/hs/hroller --skip-non-redundant -t $TESTDATA_DIR/hroller-nonredundant.data
44
>>>2
45
Error: Cannot create node graph
46
>>>=1
47

  
48
./test/hs/hroller --no-headers --ignore-non-redundant -t $TESTDATA_DIR/hroller-nonredundant.data
49
>>>/^node-01-00.,node-01-00.,node-01-00.,node-01-00.,node-01-00.,node-01-000$/
50
>>>= 0
51

  

Also available in: Unified diff