Updated Branches: refs/heads/master 129f5d01f -> 8048151e8
Add SYD zone/region to the rackspace-cloudtatabases-us provider https://issues.apache.org/jira/browse/JCLOUDS-139 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/8048151e Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/8048151e Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/8048151e Branch: refs/heads/master Commit: 8048151e83714edf662993ac4694872d2a30d748 Parents: 129f5d0 Author: zack-shoylev <[email protected]> Authored: Fri Jun 21 11:38:29 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Fri Jun 21 11:38:29 2013 -0700 ---------------------------------------------------------------------- openstack-reddwarf/src/test/resources/access_rax_us.json | 5 +++++ .../clouddatabases/us/CloudDatabasesUSProviderMetadata.java | 3 ++- .../us/CloudDatabasesUSProviderMetadataExpectTest.java | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8048151e/openstack-reddwarf/src/test/resources/access_rax_us.json ---------------------------------------------------------------------- diff --git a/openstack-reddwarf/src/test/resources/access_rax_us.json b/openstack-reddwarf/src/test/resources/access_rax_us.json index 6f71c9e..b90bebc 100644 --- a/openstack-reddwarf/src/test/resources/access_rax_us.json +++ b/openstack-reddwarf/src/test/resources/access_rax_us.json @@ -78,6 +78,11 @@ "region": "ORD", "tenantId": "717071", "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/717071"; + }, + { + "region": "SYD", + "tenantId": "717071", + "publicURL": "https://syd.databases.api.rackspacecloud.com/v1.0/717071"; } ], "name": "cloudDatabases", http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8048151e/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java b/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java index 1378ade..8441ffd 100644 --- a/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java +++ b/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java @@ -67,9 +67,10 @@ public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); properties.setProperty(SERVICE_TYPE, "rax:database"); - properties.setProperty(PROPERTY_ZONES, "ORD,DFW"); + properties.setProperty(PROPERTY_ZONES, "ORD,DFW,SYD"); properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); + properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8048151e/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java b/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java index 31825c1..7178898 100644 --- a/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java +++ b/rackspace-clouddatabases-us/src/test/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadataExpectTest.java @@ -55,9 +55,9 @@ public class CloudDatabasesUSProviderMetadataExpectTest extends BaseRedDwarfApiE .payload(payloadFromResourceWithContentType("/access_rax_us.json", "application/json")) .build(); - RedDwarfApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse); + RedDwarfApi whenRegionExists = requestSendsResponse(authenticate, authenticationResponse); - assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("ORD", "DFW")); + assertEquals(whenRegionExists.getConfiguredZones(), ImmutableSet.of("ORD", "DFW", "SYD")); }
