Add htools shell test for VCPU handling

This tests that VCPUs used by both instances and node OS are correctly
accounted in allocation.
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Makefile.am

@@ -1080,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 \

test/data/htools/hspace-tiered-vcpu.data

+group-01|fake-uuid-01|preferred||
+
+node-01-001|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1||N|1|2
+node-01-002|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1||N|1|2
+node-01-003|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1||N|1|3
+node-01-004|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1||N|1|4
+
+
+
+|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
+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

test/hs/shelltests/htools-hspace.test

@@ -52,3 +52,7 @@
  node-01-003    2
  node-01-004    2/
 >>>=0
+
+# VCPU-dominated allocation
+./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"
+>>>=0