From b94be5565cfacddbbb51589921698147ff9f7e82 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 31 Jan 2012 15:28:22 +0000 Subject: [PATCH] GleSYS provider: adjusting ISO3166 location codes --- .../main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java | 4 +++- .../jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java b/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java index 0103d0e9f3..dba345ad19 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java +++ b/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java @@ -28,6 +28,7 @@ import java.util.Properties; import org.jclouds.PropertiesBuilder; import static org.jclouds.glesys.reference.GleSYSConstants.PROPERTY_GLESYS_DEFAULT_DC; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; /** * Builds properties used in GleSYS Clients @@ -41,7 +42,8 @@ public class GleSYSPropertiesBuilder extends PropertiesBuilder { Properties properties = super.defaultProperties(); properties.setProperty(PROPERTY_ENDPOINT, "https://api.glesys.com"); properties.setProperty(PROPERTY_API_VERSION, "1"); - properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA,US-VA,BR-SP"); + properties.setProperty(PROPERTY_ZONES, "Amsterdam,Falkenberg,New York City,Stockholm"); + properties.setProperty(PROPERTY_ISO3166_CODES, "NL-NH,SE-N,US-NY,SE-AB"); properties.setProperty(PROPERTY_ZONE + ".Amsterdam." + ISO3166_CODES, "NL-NH"); properties.setProperty(PROPERTY_ZONE + ".Falkenberg." + ISO3166_CODES, "SE-N"); properties.setProperty(PROPERTY_ZONE + ".New York City." + ISO3166_CODES, "US-NY"); diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java b/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java index ae2c209fbb..abbb959205 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java +++ b/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java @@ -92,6 +92,6 @@ public class GleSYSTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { @Override protected Set getIso3166Codes() { - return ImmutableSet. of("US-CA", "US-VA", "BR-SP"); + return ImmutableSet. of("NL-NH","SE-N","US-NY","SE-AB"); } } \ No newline at end of file