Skip to content

Commit 489bd2a

Browse files
Dean Troyeranotherjesse
Dean Troyer
authored and
anotherjesse
committed
Improve exercise robustness
* Test returns and exit codes on most command invocations * Add start and end banners to make output easier to find in long log files * Adds die_if_error(), die_if_not_set() and is_set() to functions * Add some function tests Fixes bug 944593 Change-Id: I55e2962c5fec9aad237b674732b1e922ad37a62e
1 parent 4807df8 commit 489bd2a

8 files changed

Lines changed: 259 additions & 60 deletions

File tree

‎exercises/bundle.sh‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
# we will use the ``euca2ools`` cli tool that wraps the python boto
44
# library to test ec2 compatibility
5-
#
5+
6+
echo "**************************************************"
7+
echo "Begin DevStack Exercise: $0"
8+
echo "**************************************************"
69

710
# This script exits on an error so that errors don't compound and you see
811
# only the first error that occured.
@@ -16,7 +19,12 @@ set -o xtrace
1619
# ========
1720

1821
# Use openrc + stackrc + localrc for settings
19-
pushd $(cd $(dirname "$0")/.. && pwd)
22+
pushd $(cd $(dirname "$0")/.. && pwd) >/dev/null
23+
24+
# Import common functions
25+
source ./functions
26+
27+
# Import configuration
2028
source ./openrc
2129

2230
# Remove old certificates
@@ -27,7 +35,7 @@ rm -f pk.pem
2735
# Get Certificates
2836
nova x509-get-root-cert
2937
nova x509-create-cert
30-
popd
38+
popd >/dev/null
3139

3240
# Max time to wait for image to be registered
3341
REGISTER_TIMEOUT=${REGISTER_TIMEOUT:-15}
@@ -36,10 +44,14 @@ BUCKET=testbucket
3644
IMAGE=bundle.img
3745
truncate -s 5M /tmp/$IMAGE
3846
euca-bundle-image -i /tmp/$IMAGE
47+
die_if_error "Failure bundling image $IMAGE"
3948

4049

4150
euca-upload-bundle -b $BUCKET -m /tmp/$IMAGE.manifest.xml
51+
die_if_error "Failure uploading bundle $IMAGE to $BUCKET"
52+
4253
AMI=`euca-register $BUCKET/$IMAGE.manifest.xml | cut -f2`
54+
die_if_not_set AMI "Failure registering $BUCKET/$IMAGE"
4355

4456
# Wait for the image to become available
4557
if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep '$AMI' | grep 'available'; do sleep 1; done"; then
@@ -49,3 +61,9 @@ fi
4961

5062
# Clean up
5163
euca-deregister $AMI
64+
die_if_error "Failure deregistering $AMI"
65+
66+
set +o xtrace
67+
echo "**************************************************"
68+
echo "End DevStack Exercise: $0"
69+
echo "**************************************************"

‎exercises/client-env.sh‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
# Test OpenStack client enviroment variable handling
44

5+
echo "**************************************************"
6+
echo "Begin DevStack Exercise: $0"
7+
echo "**************************************************"
8+
59
# Verify client workage
610
VERIFY=${1:-""}
711

@@ -10,6 +14,11 @@ VERIFY=${1:-""}
1014

1115
# Use openrc + stackrc + localrc for settings
1216
pushd $(cd $(dirname "$0")/.. && pwd) >/dev/null
17+
18+
# Import common functions
19+
source ./functions
20+
21+
# Import configuration
1322
source ./openrc
1423
popd >/dev/null
1524

@@ -23,19 +32,10 @@ unset NOVA_URL
2332
unset NOVA_USERNAME
2433
unset NOVA_VERSION
2534

26-
# Make sure we have the vars we are expecting
27-
function is_set() {
28-
local var=\$"$1"
29-
eval echo $1=$var
30-
if eval "[ -z $var ]"; then
31-
return 1
32-
fi
33-
return 0
34-
}
35-
3635
for i in OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_AUTH_URL; do
3736
is_set $i
3837
if [[ $? -ne 0 ]]; then
38+
echo "$i expected to be set"
3939
ABORT=1
4040
fi
4141
done
@@ -52,24 +52,13 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
5252
if [[ "$SKIP_EXERCISES" =~ "key" ]] ; then
5353
STATUS_KEYSTONE="Skipped"
5454
else
55-
# We need to run the keystone test as admin since there doesn't
56-
# seem to be anything to test the cli vars that runs as a user
57-
# tenant-list should do that, it isn't implemented (yet)
58-
xOS_TENANT_NAME=$OS_TENANT_NAME
59-
xOS_USERNAME=$OS_USERNAME
60-
export OS_USERNAME=admin
61-
export OS_TENANT_NAME=admin
62-
6355
echo -e "\nTest Keystone"
6456
if keystone service-list; then
6557
STATUS_KEYSTONE="Succeeded"
6658
else
6759
STATUS_KEYSTONE="Failed"
6860
RETURN=1
6961
fi
70-
71-
OS_TENANT_NAME=$xOS_TENANT_NAME
72-
OS_USERNAME=$xOS_USERNAME
7362
fi
7463
fi
7564

@@ -139,4 +128,8 @@ report "Nova" $STATUS_NOVA
139128
report "Glance" $STATUS_GLANCE
140129
report "Swift" $STATUS_SWIFT
141130

131+
echo "**************************************************"
132+
echo "End DevStack Exercise: $0"
133+
echo "**************************************************"
134+
142135
exit $RETURN

‎exercises/euca.sh‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
# we will use the ``euca2ools`` cli tool that wraps the python boto
44
# library to test ec2 compatibility
5-
#
5+
6+
echo "**************************************************"
7+
echo "Begin DevStack Exercise: $0"
8+
echo "**************************************************"
69

710
# This script exits on an error so that errors don't compound and you see
811
# only the first error that occured.
@@ -16,9 +19,14 @@ set -o xtrace
1619
# ========
1720

1821
# Use openrc + stackrc + localrc for settings
19-
pushd $(cd $(dirname "$0")/.. && pwd)
22+
pushd $(cd $(dirname "$0")/.. && pwd) >/dev/null
23+
24+
# Import common functions
25+
source ./functions
26+
27+
# Import configuration
2028
source ./openrc
21-
popd
29+
popd >/dev/null
2230

2331
# Max time to wait while vm goes from build to active state
2432
ACTIVE_TIMEOUT=${ACTIVE_TIMEOUT:-30}
@@ -49,6 +57,7 @@ fi
4957

5058
# Launch it
5159
INSTANCE=`euca-run-instances -g $SECGROUP -t $DEFAULT_INSTANCE_TYPE $IMAGE | grep INSTANCE | cut -f2`
60+
die_if_not_set INSTANCE "Failure launching instance"
5261

5362
# Assure it has booted within a reasonable time
5463
if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-instances $INSTANCE | grep -q running; do sleep 1; done"; then
@@ -58,12 +67,15 @@ fi
5867

5968
# Allocate floating address
6069
FLOATING_IP=`euca-allocate-address | cut -f2`
70+
die_if_not_set FLOATING_IP "Failure allocating floating IP"
6171

6272
# Associate floating address
6373
euca-associate-address -i $INSTANCE $FLOATING_IP
74+
die_if_error "Failure associating address $FLOATING_IP to $INSTANCE"
6475

6576
# Authorize pinging
6677
euca-authorize -P icmp -s 0.0.0.0/0 -t -1:-1 $SECGROUP
78+
die_if_error "Failure authorizing rule in $SECGROUP"
6779

6880
# Test we can ping our floating ip within ASSOCIATE_TIMEOUT seconds
6981
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! ping -c1 -w1 $FLOATING_IP; do sleep 1; done"; then
@@ -73,9 +85,11 @@ fi
7385

7486
# Revoke pinging
7587
euca-revoke -P icmp -s 0.0.0.0/0 -t -1:-1 $SECGROUP
88+
die_if_error "Failure revoking rule in $SECGROUP"
7689

7790
# Release floating address
7891
euca-disassociate-address $FLOATING_IP
92+
die_if_error "Failure disassociating address $FLOATING_IP"
7993

8094
# Wait just a tick for everything above to complete so release doesn't fail
8195
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while euca-describe-addresses | grep $INSTANCE | grep -q $FLOATING_IP; do sleep 1; done"; then
@@ -85,6 +99,7 @@ fi
8599

86100
# Release floating address
87101
euca-release-address $FLOATING_IP
102+
die_if_error "Failure releasing address $FLOATING_IP"
88103

89104
# Wait just a tick for everything above to complete so terminate doesn't fail
90105
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while euca-describe-addresses | grep -q $FLOATING_IP; do sleep 1; done"; then
@@ -94,6 +109,7 @@ fi
94109

95110
# Terminate instance
96111
euca-terminate-instances $INSTANCE
112+
die_if_error "Failure terminating instance $INSTANCE"
97113

98114
# Assure it has terminated within a reasonable time
99115
if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -q running; do sleep 1; done"; then
@@ -103,3 +119,9 @@ fi
103119

104120
# Delete group
105121
euca-delete-group $SECGROUP
122+
die_if_error "Failure deleting security group $SECGROUP"
123+
124+
set +o xtrace
125+
echo "**************************************************"
126+
echo "End DevStack Exercise: $0"
127+
echo "**************************************************"

‎exercises/floating_ips.sh‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
#
88

99

10+
echo "**************************************************"
11+
echo "Begin DevStack Exercise: $0"
12+
echo "**************************************************"
13+
1014
# This script exits on an error so that errors don't compound and you see
1115
# only the first error that occured.
1216
set -o errexit
@@ -20,9 +24,14 @@ set -o xtrace
2024
# ========
2125

2226
# Use openrc + stackrc + localrc for settings
23-
pushd $(cd $(dirname "$0")/.. && pwd)
27+
pushd $(cd $(dirname "$0")/.. && pwd) >/dev/null
28+
29+
# Import common functions
30+
source ./functions
31+
32+
# Import configuration
2433
source ./openrc
25-
popd
34+
popd >/dev/null
2635

2736
# Max time to wait while vm goes from build to active state
2837
ACTIVE_TIMEOUT=${ACTIVE_TIMEOUT:-30}
@@ -87,15 +96,16 @@ fi
8796
# List of instance types:
8897
nova flavor-list
8998

90-
INSTANCE_TYPE=`nova flavor-list | grep $DEFAULT_INSTANCE_TYPE | cut -d"|" -f2`
99+
INSTANCE_TYPE=`nova flavor-list | grep $DEFAULT_INSTANCE_TYPE | get_field 1`
91100
if [[ -z "$INSTANCE_TYPE" ]]; then
92101
# grab the first flavor in the list to launch if default doesn't exist
93-
INSTANCE_TYPE=`nova flavor-list | head -n 4 | tail -n 1 | cut -d"|" -f2`
102+
INSTANCE_TYPE=`nova flavor-list | head -n 4 | tail -n 1 | get_field 1`
94103
fi
95104

96-
NAME="myserver"
105+
NAME="ex-float"
97106

98-
VM_UUID=`nova boot --flavor $INSTANCE_TYPE --image $IMAGE $NAME --security_groups=$SECGROUP | grep ' id ' | cut -d"|" -f3 | sed 's/ //g'`
107+
VM_UUID=`nova boot --flavor $INSTANCE_TYPE --image $IMAGE $NAME --security_groups=$SECGROUP | grep ' id ' | get_field 2`
108+
die_if_not_set VM_UUID "Failure launching $NAME"
99109

100110
# Testing
101111
# =======
@@ -114,7 +124,8 @@ if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova show $VM_UUID | grep status | g
114124
fi
115125

116126
# get the IP of the server
117-
IP=`nova show $VM_UUID | grep "private network" | cut -d"|" -f3`
127+
IP=`nova show $VM_UUID | grep "private network" | get_field 2`
128+
die_if_not_set IP "Failure retrieving IP address"
118129

119130
# for single node deployments, we can ping private ips
120131
MULTI_HOST=${MULTI_HOST:-0}
@@ -147,7 +158,8 @@ fi
147158
nova secgroup-list-rules $SECGROUP
148159

149160
# allocate a floating ip from default pool
150-
FLOATING_IP=`nova floating-ip-create | grep $DEFAULT_FLOATING_POOL | cut -d '|' -f2`
161+
FLOATING_IP=`nova floating-ip-create | grep $DEFAULT_FLOATING_POOL | get_field 1`
162+
die_if_not_set FLOATING_IP "Failure creating floating IP"
151163

152164
# list floating addresses
153165
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! nova floating-ip-list | grep -q $FLOATING_IP; do sleep 1; done"; then
@@ -157,6 +169,7 @@ fi
157169

158170
# add floating ip to our server
159171
nova add-floating-ip $VM_UUID $FLOATING_IP
172+
die_if_error "Failure adding floating IP $FLOATING_IP to $NAME"
160173

161174
# test we can ping our floating ip within ASSOCIATE_TIMEOUT seconds
162175
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! ping -c1 -w1 $FLOATING_IP; do sleep 1; done"; then
@@ -165,7 +178,8 @@ if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! ping -c1 -w1 $FLOATING_IP; do sle
165178
fi
166179

167180
# Allocate an IP from second floating pool
168-
TEST_FLOATING_IP=`nova floating-ip-create $TEST_FLOATING_POOL | grep $TEST_FLOATING_POOL | cut -d '|' -f2`
181+
TEST_FLOATING_IP=`nova floating-ip-create $TEST_FLOATING_POOL | grep $TEST_FLOATING_POOL | get_field 1`
182+
die_if_not_set TEST_FLOATING_IP "Failure creating floating IP in $TEST_FLOATING_POOL"
169183

170184
# list floating addresses
171185
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! nova floating-ip-list | grep $TEST_FLOATING_POOL | grep -q $TEST_FLOATING_IP; do sleep 1; done"; then
@@ -175,6 +189,7 @@ fi
175189

176190
# dis-allow icmp traffic (ping)
177191
nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0
192+
die_if_error "Failure deleting security group rule from $SECGROUP"
178193

179194
# FIXME (anthony): make xs support security groups
180195
if [ "$VIRT_DRIVER" != "xenserver" ]; then
@@ -188,12 +203,15 @@ fi
188203

189204
# de-allocate the floating ip
190205
nova floating-ip-delete $FLOATING_IP
206+
die_if_error "Failure deleting floating IP $FLOATING_IP"
191207

192208
# Delete second floating IP
193209
nova floating-ip-delete $TEST_FLOATING_IP
210+
die_if_error "Failure deleting floating IP $TEST_FLOATING_IP"
194211

195212
# shutdown the server
196213
nova delete $VM_UUID
214+
die_if_error "Failure deleting instance $NAME"
197215

198216
# make sure the VM shuts down within a reasonable time
199217
if ! timeout $TERMINATE_TIMEOUT sh -c "while nova show $VM_UUID | grep status | grep -q ACTIVE; do sleep 1; done"; then
@@ -203,3 +221,9 @@ fi
203221

204222
# Delete a secgroup
205223
nova secgroup-delete $SECGROUP
224+
die_if_error "Failure deleting security group $SECGROUP"
225+
226+
set +o xtrace
227+
echo "**************************************************"
228+
echo "End DevStack Exercise: $0"
229+
echo "**************************************************"

0 commit comments

Comments
 (0)