From 5a774839d73d4d9193e21acc71137f5397962317 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Wed, 26 Oct 2011 21:30:02 -0700
Subject: [PATCH] more converting sleep -> timeouts

---
 exercise.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/exercise.sh b/exercise.sh
index feecfaf..b79dc3c 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -82,11 +82,11 @@ nova boot --flavor $FLAVOR --image $IMAGE $NAME --security_groups=$SECGROUP
 # Waiting for boot
 # ----------------
 
-# let's give it 5 seconds to launch
-sleep 5
-
-# check that the status is active
-nova show $NAME | grep status | grep -q ACTIVE
+# check that the status is active within 10 seconds
+if ! timeout 10 sh -c "while ! nova show $NAME | grep status | grep -q ACTIVE; do sleep 1; done"; then
+    echo "server didn't become active!"
+    exit 1
+fi
 
 # get the IP of the server
 IP=`nova show $NAME | grep "private network" | cut -d"|" -f3`
@@ -121,21 +121,21 @@ FLOATING_IP=`nova floating-ip-list | grep None | head -1 | cut -d '|' -f2 | sed
 # add floating ip to our server
 nova add-floating-ip $NAME $FLOATING_IP
 
-# sleep for a smidge
-sleep 5
+# test we can ping our floating ip within 10 seconds
+if ! timeout 10 sh -c "while ! ping -c1 -w1 $FLOATING_IP; do sleep 1; done"; then
+    echo "Couldn't ping server with floating ip"
+    exit 1
+fi
 
-# ping our floating ip
 ping -c1 -w1 $FLOATING_IP
 
 # dis-allow icmp traffic (ping)
 nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0
 
-# sleep for a smidge
-sleep 5
-
-# ping our floating ip
-if ( ping -c1 -w1 $FLOATING_IP ); then
+# test we can aren't able to ping our floating ip within 10 seconds
+if ! timeout 10 sh -c "while ping -c1 -w1 $FLOATING_IP; do sleep 1; done"; then
     print "Security group failure - ping should not be allowed!"
+    echo "Couldn't ping server with floating ip"
     exit 1
 fi