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

added iso data to joyent

This commit is contained in:
Adrian Cole 2012-06-14 15:35:12 -04:00
parent 4f2232e6da
commit 6cb7829b1b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
labs/joyentcloud/src/main/java/org/jclouds/joyent/joyentcloud/JoyentCloudProviderMetadata.java
View File

@ -18,6 +18,10 @@
*/ */
package org.jclouds.joyent.joyentcloud; package org.jclouds.joyent.joyentcloud;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
@ -53,6 +57,11 @@ public class JoyentCloudProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty(PROPERTY_ZONES, "us-east-1,us-west-1,us-sw-1,eu-ams-1");
properties.setProperty(PROPERTY_ZONE + ".us-east-1." + ISO3166_CODES, "US-VA");
properties.setProperty(PROPERTY_ZONE + ".us-west-1." + ISO3166_CODES, "US-CA");
properties.setProperty(PROPERTY_ZONE + ".us-sw-1." + ISO3166_CODES, "US-NV");
properties.setProperty(PROPERTY_ZONE + ".eu-ams-1." + ISO3166_CODES, "NL-NH");
return properties; return properties;
} }
@ -64,7 +73,7 @@ public class JoyentCloudProviderMetadata extends BaseProviderMetadata {
.apiMetadata(new SDCApiMetadata()) .apiMetadata(new SDCApiMetadata())
.homepage(URI.create("http://www.joyent.com/products/smartdatacenter/")) .homepage(URI.create("http://www.joyent.com/products/smartdatacenter/"))
.console(URI.create("https://my.joyentcloud.com/login")) .console(URI.create("https://my.joyentcloud.com/login"))
.iso3166Codes("TODO") .iso3166Codes("US-VA", "US-CA", "US-NV", "NL-NH")
.endpoint("https://api.joyentcloud.com") .endpoint("https://api.joyentcloud.com")
.defaultProperties(JoyentCloudProviderMetadata.defaultProperties()); .defaultProperties(JoyentCloudProviderMetadata.defaultProperties());
} }

2
labs/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java
View File

@ -80,6 +80,6 @@ public class JoyentCloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveT
@Override @Override
protected Set<String> getIso3166Codes() { protected Set<String> getIso3166Codes() {
return ImmutableSet.<String> of("TODO"); return ImmutableSet.<String> of("US-VA", "US-CA", "US-NV", "NL-NH");
} }
} }