From b1da61fa03b4365a1f81f14d71df882fc05ba65f Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 13 Sep 2010 20:53:18 -0700
Subject: [PATCH] workaround eucalyptus problem

---
 .../ec2/xml/DescribeRegionsResponseHandler.java   |  9 ++++-----
 ...cribeAvailabilityZonesResponseHandlerTest.java | 14 +++++++-------
 .../xml/DescribeRegionsResponseHandlerTest.java   | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandler.java b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandler.java
index abe9b9aadf..afa572f873 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandler.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandler.java
@@ -33,8 +33,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class DescribeRegionsResponseHandler extends
-      ParseSax.HandlerWithResult<Map<String, URI>> {
+public class DescribeRegionsResponseHandler extends ParseSax.HandlerWithResult<Map<String, URI>> {
    private StringBuilder currentText = new StringBuilder();
 
    private Map<String, URI> regionEndpoints = Maps.newHashMap();
@@ -52,11 +51,11 @@ public class DescribeRegionsResponseHandler extends
          String pending = currentText.toString().trim();
          if (pending.indexOf("Walrus") == -1)
             region = pending;
-      } else if (qName.equals("regionEndpoint")) {
+         // Eucalyptus uses regionUrl
+      } else if (qName.equals("regionEndpoint") || qName.equals("regionUrl")) {
          String pending = currentText.toString().trim();
          if (pending.indexOf("Walrus") == -1)
-            regionEndpoint = URI.create(pending.startsWith("http") ? pending
-                  : String.format("https://%s", pending));
+            regionEndpoint = URI.create(pending.startsWith("http") ? pending : String.format("https://%s", pending));
       } else if (qName.equals("item") && region != null) {
          regionEndpoints.put(region, regionEndpoint);
          this.region = null;
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java
index 5539e339bd..1e5153eacd 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeAvailabilityZonesResponseHandlerTest.java
@@ -66,16 +66,16 @@ public class DescribeAvailabilityZonesResponseHandlerTest extends BaseHandlerTes
       Set<AvailabilityZoneInfo> expected = ImmutableSet.<AvailabilityZoneInfo> of(
 
       new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1A, "available", Region.US_EAST_1, ImmutableSet.<String> of()),
-            new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1B, "available", Region.US_EAST_1, ImmutableSet
-                  .<String> of()),
+               new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1B, "available", Region.US_EAST_1, ImmutableSet
+                        .<String> of()),
 
-            new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1C, "available", Region.US_EAST_1, ImmutableSet
-                  .<String> of("our service is awesome")),
+               new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1C, "available", Region.US_EAST_1, ImmutableSet
+                        .<String> of("our service is awesome")),
 
-            new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1D, "downlikeaclown", Region.US_EAST_1, ImmutableSet
-                  .<String> of()));
+               new AvailabilityZoneInfo(AvailabilityZone.US_EAST_1D, "downlikeaclown", Region.US_EAST_1, ImmutableSet
+                        .<String> of()));
       Set<AvailabilityZoneInfo> result = factory.create(
-            injector.getInstance(DescribeAvailabilityZonesResponseHandler.class)).parse(is);
+               injector.getInstance(DescribeAvailabilityZonesResponseHandler.class)).parse(is);
 
       assertEquals(result, expected);
    }
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandlerTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandlerTest.java
index 0811221e91..ec6159ebaf 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandlerTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeRegionsResponseHandlerTest.java
@@ -95,6 +95,21 @@ public class DescribeRegionsResponseHandlerTest extends BaseHandlerTest {
 
       assertEquals(result, expected);
    }
+   
+   public void testEuc2() {
+
+      InputStream is = Utils
+            .toInputStream("<?xml version=\"1.0\" ?><DescribeRegionsResponse xmlns=\"http://ec2.amazonaws.com/doc/2009-11-30/\"><requestId>1LAQRTCLTLPS6CEIC627</requestId><regionInfo><item><regionUrl>http://10.255.255.1:8773/services/Cloud</regionUrl><regionName>nova</regionName></item></regionInfo></DescribeRegionsResponse>");
+
+      Map<String, URI> expected = ImmutableMap.<String, URI> of("nova",
+            URI.create("http://10.255.255.1:8773/services/Cloud"));
+
+      Map<String, URI> result = factory.create(
+            injector.getInstance(DescribeRegionsResponseHandler.class)).parse(
+            is);
+
+      assertEquals(result, expected);
+   }
 
    public void testUnsupportedAdditionalRegionDoesntBreak() {