Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated iso codes

This commit is contained in:
Adrian Cole 2011-10-16 09:21:47 -07:00
parent 059f2de01a
commit b582095f56
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridPropertiesBuilder.java
View File

@ -41,10 +41,11 @@ public class GoGridPropertiesBuilder extends PropertiesBuilder {
@Override @Override
protected Properties defaultProperties() { protected Properties defaultProperties() {
Properties properties = super.defaultProperties(); Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_ZONES, "1,2"); properties.setProperty(PROPERTY_ZONES, "1,2,3");
properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA,US-VA"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA,US-VA,BR-SP");
properties.setProperty(PROPERTY_ZONE + ".1." + ISO3166_CODES, "US-CA"); properties.setProperty(PROPERTY_ZONE + ".1." + ISO3166_CODES, "US-CA");
properties.setProperty(PROPERTY_ZONE + ".2." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_ZONE + ".2." + ISO3166_CODES, "US-VA");
properties.setProperty(PROPERTY_ZONE + ".3." + ISO3166_CODES, "BR-SP");
properties.setProperty(PROPERTY_API_VERSION, GoGridAsyncClient.VERSION); properties.setProperty(PROPERTY_API_VERSION, GoGridAsyncClient.VERSION);
properties.setProperty(PROPERTY_ENDPOINT, "https://api.gogrid.com/api"); properties.setProperty(PROPERTY_ENDPOINT, "https://api.gogrid.com/api");
properties.setProperty(PROPERTY_GOGRID_DEFAULT_DC, "1"); properties.setProperty(PROPERTY_GOGRID_DEFAULT_DC, "1");

5
providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
View File

@ -27,7 +27,7 @@ import org.jclouds.providers.BaseProviderMetadata;
import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.ProviderMetadata;
/** /**
* Implementation of {@ link org.jclouds.types.ProviderMetadata} for GoGrid. * Implementation of @ link org.jclouds.types.ProviderMetadata} for GoGrid.
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@ -88,6 +88,7 @@ public class GoGridProviderMetadata extends BaseProviderMetadata {
public URI getConsole() { public URI getConsole() {
return URI.create("https://my.gogrid.com/gogrid"); return URI.create("https://my.gogrid.com/gogrid");
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@ -109,7 +110,7 @@ public class GoGridProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public Set<String> getIso3166Codes() { public Set<String> getIso3166Codes() {
return ImmutableSet.of("US-CA","US-VA"); return ImmutableSet.of("US-CA", "US-VA", "BR-SP");
} }
} }

2
providers/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
View File

@ -80,6 +80,6 @@ public class GoGridTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
@Override @Override
protected Set<String> getIso3166Codes() { protected Set<String> getIso3166Codes() {
return ImmutableSet.<String> of("US-CA", "US-VA"); return ImmutableSet.<String> of("US-CA", "US-VA", "BR-SP");
} }
} }

2
providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudPropertiesBuilder.java
View File

@ -37,7 +37,7 @@ public class TerremarkECloudPropertiesBuilder extends TerremarkVCloudPropertiesB
@Override @Override
protected Properties defaultProperties() { protected Properties defaultProperties() {
Properties properties = super.defaultProperties(); Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_ISO3166_CODES, "US-FL,NL-NH"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-FL,US-VA,NL-NH,BR-SP");
properties.setProperty(PROPERTY_API_VERSION, "0.8b-ext2.8"); properties.setProperty(PROPERTY_API_VERSION, "0.8b-ext2.8");
properties.setProperty(PROPERTY_ENDPOINT, "https://services.enterprisecloud.terremark.com/api"); properties.setProperty(PROPERTY_ENDPOINT, "https://services.enterprisecloud.terremark.com/api");
properties.setProperty(PROPERTY_TERREMARK_EXTENSION_NAME, "eCloudExtensions"); properties.setProperty(PROPERTY_TERREMARK_EXTENSION_NAME, "eCloudExtensions");

2
providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
View File

@ -102,7 +102,7 @@ public class TerremarkECloudProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public Set<String> getIso3166Codes() { public Set<String> getIso3166Codes() {
return ImmutableSet.of("US-FL"); return ImmutableSet.<String> of("US-FL", "US-VA", "NL-NH", "BR-SP");
} }
} }

2
providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java
View File

@ -90,6 +90,6 @@ public class TerremarkECloudTemplateBuilderLiveTest extends BaseTemplateBuilderL
@Override @Override
protected Set<String> getIso3166Codes() { protected Set<String> getIso3166Codes() {
return ImmutableSet.<String> of("US-FL", "NL-NH"); return ImmutableSet.<String> of("US-FL", "US-VA", "NL-NH", "BR-SP");
} }
} }