Skip to content
Browse files

Merge pull request #6 from rackerjoe/master

update floating ip test to capture the output from the fedora euca2ools
  • Loading branch information...
2 parents 10c12ec + 1f83b83 commit 0075ebc703f82537262a2d8a9f07d6b660a440ca @breu breu committed Jun 26, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 exercises/euca.sh
View
5 exercises/euca.sh
@@ -64,10 +64,13 @@ function 040_launch_instance() {
function 050_associate_floating_ip() {
# Allocate floating address
+ # euca2ools on ubuntu returns Zero for zero floating IP addresses
+ # while the same tool on fedora returns None. I am sure there are
+ # other variances that we don't about yet.
FLOATING_IP=$(euca-allocate-address | cut -d" " -f2)
EUCA_HAS_FLOATING=1
- if [[ ${FLOATING_IP} =~ "Zero" ]]; then
+ if [[ ${FLOATING_IP} =~ "Zero" || ${FLOATING_IP} =~ "None" ]]; then
EUCA_HAS_FLOATING=0
SKIP_MSG="No floating ips"
SKIP_TEST=1

0 comments on commit 0075ebc

Please sign in to comment.
Something went wrong with that request. Please try again.