Repository: jclouds-labs Updated Branches: refs/heads/master 7aa033a97 -> 215415c3a
Added new US-NJ location to ProfitBricks Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/215415c3 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/215415c3 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/215415c3 Branch: refs/heads/master Commit: 215415c3a53551011b623bca5d843a006b5ba3f1 Parents: 7aa033a Author: Ignasi Barrera <[email protected]> Authored: Mon May 22 14:35:14 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Mon May 22 14:35:14 2017 +0200 ---------------------------------------------------------------------- .../profitbricks/rest/ProfitBricksProviderMetadata.java | 11 ++++++----- .../jclouds/profitbricks/rest/domain/Location.java | 1 + .../compute/ProfitBricksTemplateBuilderLiveTest.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/215415c3/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java index 614dda9..4953db3 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksProviderMetadata.java @@ -58,13 +58,14 @@ public class ProfitBricksProviderMetadata extends BaseProviderMetadata { properties.setProperty(PROPERTY_REGIONS, "de,us"); properties.setProperty(PROPERTY_REGION + ".de.zones", "de/fkb,de/fra"); - properties.setProperty(PROPERTY_REGION + ".us.zones", "us/las,us/lasdev"); - properties.setProperty(PROPERTY_ZONES, "de/fkb,de/fra,us/las,us/lasdev"); - properties.setProperty(PROPERTY_ISO3166_CODES, "DE-BW,DE-HE,US_NV"); + properties.setProperty(PROPERTY_REGION + ".us.zones", "us/ewr,us/las,us/lasdev"); + properties.setProperty(PROPERTY_ZONES, "de/fkb,de/fra,us/ewr,us/las,us/lasdev"); + properties.setProperty(PROPERTY_ISO3166_CODES, "DE-BW,DE-HE,US-NJ,US_NV"); properties.setProperty(PROPERTY_REGION + ".de." + ISO3166_CODES, "DE-BW,DE-HE"); - properties.setProperty(PROPERTY_REGION + ".us." + ISO3166_CODES, "US-NV"); + properties.setProperty(PROPERTY_REGION + ".us." + ISO3166_CODES, "US-NJ,US-NV"); properties.setProperty(PROPERTY_ZONE + ".de/fkb." + ISO3166_CODES, "DE-BW"); properties.setProperty(PROPERTY_ZONE + ".de/fra." + ISO3166_CODES, "DE-HE"); + properties.setProperty(PROPERTY_ZONE + ".us/ewr." + ISO3166_CODES, "US-NJ"); properties.setProperty(PROPERTY_ZONE + ".us/las." + ISO3166_CODES, "US-NV"); properties.setProperty(PROPERTY_ZONE + ".us/lasdev." + ISO3166_CODES, "US-NV"); @@ -90,7 +91,7 @@ public class ProfitBricksProviderMetadata extends BaseProviderMetadata { .apiMetadata(new ProfitBricksApiMetadata()) .homepage(URI.create("https://www.profitbricks.com/";)) .console(URI.create("https://my.profitbricks.com/dashboard/dcdr2";)) - .iso3166Codes("DE-BW", "DE-HE", "US-NV") + .iso3166Codes("DE-BW", "DE-HE", "US-NJ", "US-NV") .endpoint("https://api.profitbricks.com/cloudapi/v3/";) .defaultProperties(ProfitBricksProviderMetadata.defaultProperties()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/215415c3/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Location.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Location.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Location.java index 3ce5163..78e7ec2 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Location.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/Location.java @@ -20,6 +20,7 @@ public enum Location { DE_FKB("de/fkb", "Germany, Karlsruhe"), DE_FRA("de/fra", "Germany, Frankfurt (M)"), + US_EWR("us/ewr", "USA, Newark"), US_LAS("us/las", "USA, Las Vegas"), US_LASDEV("us/lasdev", "USA Developer cluster"), UNRECOGNIZED("unrecognized", "Unrecognized location"), http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/215415c3/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/ProfitBricksTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/ProfitBricksTemplateBuilderLiveTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/ProfitBricksTemplateBuilderLiveTest.java index a9c8d9d..07c994e 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/ProfitBricksTemplateBuilderLiveTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/ProfitBricksTemplateBuilderLiveTest.java @@ -32,7 +32,7 @@ public class ProfitBricksTemplateBuilderLiveTest extends BaseTemplateBuilderLive @Override protected Set<String> getIso3166Codes() { - return ImmutableSet.of("DE-BW", "DE-HE", "US-NV"); + return ImmutableSet.of("DE-BW", "DE-HE", "US-NJ", "US-NV"); } @Override
