Revision d90b69f6

b/Makefile.am
1080 1080
	test/data/htools/hspace-tiered-ipolicy.data \
1081 1081
	test/data/htools/hspace-tiered-mixed.data \
1082 1082
	test/data/htools/hspace-tiered-resourcetypes.data \
1083
	test/data/htools/hspace-tiered-vcpu.data \
1083 1084
	test/data/htools/hspace-tiered.data \
1084 1085
	test/data/htools/invalid-node.data \
1085 1086
	test/data/htools/missing-resources.data \
b/test/data/htools/hspace-tiered-vcpu.data
1
group-01|fake-uuid-01|preferred||
2

  
3
node-01-001|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1||N|1|2
4
node-01-002|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1||N|1|2
5
node-01-003|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1||N|1|3
6
node-01-004|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1||N|1|4
7

  
8

  
9

  
10
|30720,2,64512,1,1,1|30720,2,64512,1,1,1;32768,4,65536,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|1.0|32.0
11
group-01|30720,2,64512,1,1,1|30720,2,64512,1,1,1;32768,4,65536,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|1.0|32.0
b/test/hs/shelltests/htools-hspace.test
52 52
 node-01-003    2
53 53
 node-01-004    2/
54 54
>>>=0
55

  
56
# VCPU-dominated allocation
57
./test/hs/hspace --machine-readable -t $TESTDATA_DIR/hspace-tiered-vcpu.data > $T/capacity && sh -c ". $T/capacity && test \"\${HTS_TSPEC}\" = '32768,65536,4,12=4 32768,65536,2,12=2' && test \"\${HTS_ALLOC_INSTANCES}\" = 10"
58
>>>=0

Also available in: Unified diff