Add support for testing with different resource types other than dummy nodes.

Author: stack

.gitignore

@@ -1 +1,2 @@
 clouds.yaml
+tests/functional/err*

tests/functional/setup.sh

@@ -4,11 +4,16 @@ tmpfile="$1"
 project_id="$2"
 start="$3"
 end="$4"
+resource_type="$5"
 lessee_option=''
 nodefile=$(mktemp /tmp/nodes/XXXX)
 errfile=$(mktemp ./errXXXXXX)
 node_uuid=$(echo $nodefile | sed 's/\/tmp\/nodes\///')
 
+if [[ -z "$5" ]]; then
+    resource_type="dummy_node"
+fi
+
 # Create dummy node
 
 cat <<EOF > /tmp/nodes/$node_uuid
@@ -26,8 +31,8 @@ cat <<EOF > /tmp/nodes/$node_uuid
 EOF
 
 # Check if the lessee was passed
-if ! [[ -z "$5" ]]; then
-  lessee_option=" --lessee $5"
+if ! [[ -z "$6" ]]; then
+  lessee_option=" --lessee $6"
 fi
 
 #######################
@@ -42,7 +47,7 @@ openstack --os-cloud test1 esi offer create \
   $node_uuid \
   --start-time "$start" \
   --end-time "$end" \
-  --resource-type dummy_node\
+  --resource-type "$resource_type"\
   $lessee_option \
   -f shell > $tmpfile \
   || { ec=$?; echo "ERROR: failed to create offer" >&2; exit $ec; }

tests/functional/test-lease-expire.sh

@@ -4,6 +4,7 @@ project_id=75681640118a4890b3da0d106eae8af7 # test1 uuid
 tmpfile=$(mktemp ./leaseXXXXXX)
 start=$(date +%Y-%m-%d)
 end=$(date -d "+5 days" +"%Y-%m-%d")
+resource_type="dummy_node"
 
 # Setup script, contains offer create test
 

tests/functional/test-lessee-id.sh

@@ -4,11 +4,12 @@ project_id=75681640118a4890b3da0d106eae8af7 # test1 uuid
 tmpfile=$(mktemp ./leaseXXXXXX)
 start=$(date +%Y-%m-%d)
 end=$(date -d "+5 days" +%Y-%m-%d)
+resource_type="dummy_node"
 lessee='test1-subproject'
 
 # Setup script, contains offer create test
 
-./setup.sh "$tmpfile" "$project_id" "$start" "$end" "$lessee"
+./setup.sh "$tmpfile" "$project_id" "$start" "$end" "$resource_type" "$lessee"
 
 # Sources variables defined in the setup script
 . $tmpfile
@@ -78,7 +79,7 @@ cat <<EOF
 Created lease $uuid:
   Starting at: $start_time
   Ending at:   $end_time
-  For: $resource_type $resource_uuid
+  For: $resource_type ${nodefile##/tmp/nodes/}
   From offer:  $test_offer_uuid
 EOF
 

tests/functional/test-no-lessee-id.sh

@@ -4,10 +4,11 @@ project_id=75681640118a4890b3da0d106eae8af7 # test1 uuid
 tmpfile=$(mktemp ./leaseXXXXXX)
 start=$(date +%Y-%m-%d)
 end=$(date -d "+5 days" +%Y-%m-%d)
+resource_type="dummy_node"
 
 # Setup script, contains offer create test
 
-./setup.sh $tmpfile $project_id $start $end
+./setup.sh "$tmpfile" "$project_id" "$start" "$end" "$resource_type"
 
 . $tmpfile
 
@@ -28,10 +29,10 @@ openstack --os-cloud test1 esi offer create \
   $node_uuid \
   --start-time $start \
   --end-time $end \
-  --resource-type dummy_node \
+  --resource-type $resource_type \
   -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error="Time conflict for dummy_node $node_uuid."
+expected_error="Time conflict for $resource_type $node_uuid."
 
 if ! cat $errfile | grep -q "$expected_error"; then
   if [[ $ec -eq 0 ]]; then

tests/functional/test-no-offer.sh

@@ -6,7 +6,8 @@ start=$(date +%Y-%m-%d)
 end=$(date -d "+5 days" +%Y-%m-%d)
 nodefile=$(mktemp /tmp/nodes/XXXX)
 errfile=$(mktemp ./errXXXXXX)
-node_uuid=$(echo $nodefile | sed 's/\/tmp\/nodes\///')
+node_uuid=${nodefile##/tmp/nodes}
+resource_type="dummy_node"
 
 trap "rm -f $nodefile $tmpfile $errfile" EXIT
 
@@ -39,7 +40,7 @@ openstack --os-cloud test1 esi lease create \
   test1-subproject \
   --start-time $start \
   --end-time $end \
-  --resource-type dummy_node \
+  --resource-type $resource_type \
   -f shell > $tmpfile \
   || { ec=$?; echo "ERROR: failed to create lease" >&2; exit $ec; }
 
@@ -73,10 +74,10 @@ openstack --os-cloud test2 esi offer create \
   $node_uuid \
   --start-time $start \
   --end-time $end \
-  --resource-type dummy_node \
+  --resource-type $resource_type \
   -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error="Access was denied to dummy_node $node_uuid."
+expected_error="Access was denied to $resource_type $node_uuid."
 
 if ! cat $errfile | grep -q "$expected_error"; then
   if [[ $ec -eq 0 ]]; then
@@ -106,10 +107,10 @@ openstack --os-cloud test2 esi lease create \
   test2-subproject \
   --start-time $start \
   --end-time $end \
-  --resource-type dummy_node \
+  --resource-type $resource_type \
   -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error="Access was denied to dummy_node $node_uuid."
+expected_error="Access was denied to $resource_type $node_uuid."
 
 if ! cat $errfile | grep -q "$expected_error"; then
   if [[ $ec -eq 0 ]]; then

tests/functional/test-offer-expire.sh

@@ -4,6 +4,7 @@ project_id=75681640118a4890b3da0d106eae8af7 # test1 uuid
 tmpfile=$(mktemp ./leaseXXXXXX)
 start=$(date +%Y-%m-%d)
 end=$(date -d "+1 minute" +"%Y-%m-%d %H:%M:%S")
+resource_type="dummy_node"
 
 # Setup script, contains offer create test