From 5123195eec3e9cfeac6f0da444a5a81428877729 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 15 Jun 2012 19:13:38 -0400 Subject: [PATCH] Issue 976:update to support eucalyptus 3 --- .../xml/DescribeRegionsResponseHandler.java | 2 +- .../config/EC2RestClientModuleExpectTest.java | 2 +- apis/eucalyptus/pom.xml | 2 +- .../EucalyptusPropertiesBuilder.java | 7 +- .../EucalyptusRestClientModuleExpectTest.java | 106 ++++++++++++++++++ .../internal/BaseEucalyptusExpectTest.java | 97 ++++++++++++++++ .../availabilityZones-eucalyptus.xml | 11 ++ .../test/resources/regionEndpoints-euca.xml | 12 ++ apis/walrus/pom.xml | 2 +- .../walrus/WalrusPropertiesBuilder.java | 2 + providers/eucalyptus-partnercloud-ec2/pom.xml | 5 +- ...lyptusPartnerCloudEC2ProviderMetadata.java | 2 +- ...calyptusPartnerCloudPropertiesBuilder.java | 7 +- ...rtnerCloudComputeServiceContextModule.java | 14 --- ...CloudEucalyptusComputeServiceLiveTest.java | 12 -- providers/eucalyptus-partnercloud-s3/pom.xml | 2 +- ...alyptusPartnerCloudS3ProviderMetadata.java | 2 +- ...usPartnerCloudWalrusPropertiesBuilder.java | 8 +- 18 files changed, 246 insertions(+), 49 deletions(-) create mode 100644 apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/config/EucalyptusRestClientModuleExpectTest.java create mode 100644 apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/internal/BaseEucalyptusExpectTest.java create mode 100644 apis/eucalyptus/src/test/resources/availabilityZones-eucalyptus.xml create mode 100644 apis/eucalyptus/src/test/resources/regionEndpoints-euca.xml diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java index 5d5cd37bfe..af493eb8b1 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeRegionsResponseHandler.java @@ -55,7 +55,7 @@ public class DescribeRegionsResponseHandler extends ParseSax.HandlerWithResult { assertEquals(injector.getInstance(RegionToEndpointOrProviderIfNull.class).apply("us-west-2"), URI.create("https://ec2.us-west-2.amazonaws.com")); } - + @Override public Injector createClient(Function fn, Module module, Properties props) { return createInjector(fn, module, props); diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml index 17e662fe04..a7e594de75 100644 --- a/apis/eucalyptus/pom.xml +++ b/apis/eucalyptus/pom.xml @@ -34,7 +34,7 @@ bundle - http://ecc.eucalyptus.com:8773/services/Eucalyptus + http://partnercloud.eucalyptus.com:8773/services/Eucalyptus/ 2010-06-15 FIXME_IDENTITY diff --git a/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusPropertiesBuilder.java b/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusPropertiesBuilder.java index 1f9239c7ba..541f7ab6bb 100644 --- a/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusPropertiesBuilder.java +++ b/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusPropertiesBuilder.java @@ -20,7 +20,6 @@ package org.jclouds.eucalyptus; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_PORT_OPEN; -import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import java.util.Properties; @@ -36,9 +35,9 @@ public class EucalyptusPropertiesBuilder extends EC2PropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_ENDPOINT, "http://173.205.188.130:8773/services/Eucalyptus"); - properties.setProperty(PROPERTY_REGIONS, "Eucalyptus"); - properties.setProperty(PROPERTY_EC2_AMI_OWNERS, "admin"); + properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Eucalyptus/"); + // in version 3, lowecase 'e' version 2, uppercase 'E' + properties.setProperty(PROPERTY_REGIONS, "eucalyptus"); properties.setProperty(PROPERTY_TIMEOUT_PORT_OPEN, 5 * 60 * 1000 + ""); return properties; } diff --git a/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/config/EucalyptusRestClientModuleExpectTest.java b/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/config/EucalyptusRestClientModuleExpectTest.java new file mode 100644 index 0000000000..722d4b2147 --- /dev/null +++ b/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/config/EucalyptusRestClientModuleExpectTest.java @@ -0,0 +1,106 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jclouds.eucalyptus.config; + +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import org.jclouds.eucalyptus.internal.BaseEucalyptusExpectTest; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.jclouds.location.Region; +import org.jclouds.location.Zone; +import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; +import org.jclouds.location.functions.ZoneToEndpoint; +import org.testng.annotations.Test; + +import com.google.common.base.Function; +import com.google.common.base.Supplier; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; + +/** + * @author Adrian Cole + */ +@Test(groups = "unit", testName = "EucalyptusRestClientModuleExpectTest") +public class EucalyptusRestClientModuleExpectTest extends BaseEucalyptusExpectTest { + private Injector injector; + + public EucalyptusRestClientModuleExpectTest() { + Builder builder = ImmutableMap. builder(); + builder.put(describeRegionsRequest, describeRegionsResponse); + builder.put(describeAZRequest, describeAZResponse); + + injector = requestsSendResponses(builder.build()); + } + + public void testLocationIdAndURIBindings() { + + assertEquals(injector.getInstance(Key.get(new TypeLiteral>>() { + }, Region.class)).get(), ImmutableSet. of("eucalyptus")); + + assertEquals(injector.getInstance(Key.get(new TypeLiteral>>() { + }, Zone.class)).get(), ImmutableSet. of("partner01")); + + Map> regionToURISupplier = injector.getInstance( + Key.get(new TypeLiteral>>>() { + }, Region.class)).get(); + + assertEquals(regionToURISupplier.get("eucalyptus").get(), URI.create("http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus")); + + Map>> regionToZoneIdSupplier = injector.getInstance( + Key.get(new TypeLiteral>>>>() { + }, Zone.class)).get(); + + assertEquals(regionToZoneIdSupplier.get("eucalyptus").get(), ImmutableSet.of("partner01")); + + Map> zoneToURISupplier = injector.getInstance( + Key.get(new TypeLiteral>>>() { + }, Zone.class)).get(); + + assertEquals(zoneToURISupplier.get("partner01").get(), URI.create("http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus")); + + } + + public void testZoneToEndpoint() { + assertEquals(injector.getInstance(ZoneToEndpoint.class).apply("partner01"), + URI.create("http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus")); + + } + + public void testRegionToEndpointOrProviderIfNull() { + assertEquals(injector.getInstance(RegionToEndpointOrProviderIfNull.class).apply("eucalyptus"), + URI.create("http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus")); + } + + @Override + public Injector createClient(Function fn, Module module, Properties props) { + return createInjector(fn, module, props); + } + +} diff --git a/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/internal/BaseEucalyptusExpectTest.java b/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/internal/BaseEucalyptusExpectTest.java new file mode 100644 index 0000000000..ebfe5989bd --- /dev/null +++ b/apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/internal/BaseEucalyptusExpectTest.java @@ -0,0 +1,97 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jclouds.eucalyptus.internal; + +import java.net.URI; + +import javax.ws.rs.core.MediaType; + +import org.jclouds.date.DateService; +import org.jclouds.date.internal.SimpleDateFormatDateService; +import org.jclouds.ec2.EC2AsyncClient; +import org.jclouds.ec2.EC2Client; +import org.jclouds.ec2.config.EC2RestClientModule; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.jclouds.http.RequiresHttp; +import org.jclouds.rest.BaseRestClientExpectTest; +import org.jclouds.rest.ConfiguresRestClient; + +import com.google.common.collect.ImmutableMultimap; +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public abstract class BaseEucalyptusExpectTest extends BaseRestClientExpectTest { + protected static final String CONSTANT_DATE = "2012-04-16T15:54:08.897Z"; + + protected DateService dateService = new SimpleDateFormatDateService(); + + protected HttpRequest describeRegionsRequest = HttpRequest + .builder() + .method("POST") + .endpoint(URI.create("http://partnercloud.eucalyptus.com:8773/services/Eucalyptus/")) + .headers(ImmutableMultimap.of("Host", "partnercloud.eucalyptus.com:8773")) + .payload(payloadFromStringWithContentType( + "Action=DescribeRegions&Signature=tp9WpT8503JdxIXYu6Eu2Dmu%2Bd%2FpqviST7N7Fvr%2FyQo%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2010-06-15&AWSAccessKeyId=identity", + MediaType.APPLICATION_FORM_URLENCODED)).build(); + + protected HttpResponse describeRegionsResponse = HttpResponse.builder().statusCode(200) + .payload(payloadFromResourceWithContentType("/regionEndpoints-euca.xml", MediaType.APPLICATION_XML)) + .build(); + + protected HttpRequest describeAZRequest = HttpRequest.builder() + .method("POST") + .endpoint(URI.create("http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus/")) + .headers(ImmutableMultimap.of("Host", "eucalyptus.partner.eucalyptus.com:8773")) + .payload(payloadFromStringWithContentType( + "Action=DescribeAvailabilityZones&Signature=i4OkMed1sqQV7hlF%2Fl1KdbQwmwJ4Fh4o9W32eVGayPk%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2010-06-15&AWSAccessKeyId=identity", + MediaType.APPLICATION_FORM_URLENCODED)).build(); + + protected HttpResponse describeAZResponse = HttpResponse.builder().statusCode(200) + .payload(payloadFromResourceWithContentType( + "/availabilityZones-eucalyptus.xml", MediaType.APPLICATION_XML)).build(); + + + public BaseEucalyptusExpectTest() { + provider = "eucalyptus"; + } + + @RequiresHttp + @ConfiguresRestClient + public static class StubEC2RestClientModule extends EC2RestClientModule { + + public StubEC2RestClientModule() { + super(EC2Client.class, EC2AsyncClient.class, DELEGATE_MAP); + } + + @Override + protected String provideTimeStamp(DateService dateService) { + return CONSTANT_DATE; + } + } + + @Override + protected Module createModule() { + return new StubEC2RestClientModule(); + } + +} diff --git a/apis/eucalyptus/src/test/resources/availabilityZones-eucalyptus.xml b/apis/eucalyptus/src/test/resources/availabilityZones-eucalyptus.xml new file mode 100644 index 0000000000..0c5a0525ae --- /dev/null +++ b/apis/eucalyptus/src/test/resources/availabilityZones-eucalyptus.xml @@ -0,0 +1,11 @@ + + + + partner01 + 173.205.188.7 arn:euca:eucalyptus:partner01:cluster:cc_01/ + + + + + \ No newline at end of file diff --git a/apis/eucalyptus/src/test/resources/regionEndpoints-euca.xml b/apis/eucalyptus/src/test/resources/regionEndpoints-euca.xml new file mode 100644 index 0000000000..a3b205c2e6 --- /dev/null +++ b/apis/eucalyptus/src/test/resources/regionEndpoints-euca.xml @@ -0,0 +1,12 @@ + + + + eucalyptus + http://eucalyptus.partner.eucalyptus.com:8773/services/Eucalyptus + + + walrus + http://walrus.partner.eucalyptus.com:8773/services/Walrus + + + \ No newline at end of file diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml index 6c9923b26f..21aaad57d2 100644 --- a/apis/walrus/pom.xml +++ b/apis/walrus/pom.xml @@ -35,7 +35,7 @@ org.jclouds.walrus.blobstore.WalrusTestInitializer - http://ecc.eucalyptus.com:8773/services/Walrus + http://walrus.partner.eucalyptus.com:8773/services/Walrus 2006-03-01 ${test.eucalyptus.identity} diff --git a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java index 6d61163568..dae50624f6 100644 --- a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java +++ b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusPropertiesBuilder.java @@ -19,6 +19,7 @@ package org.jclouds.walrus; import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; @@ -36,6 +37,7 @@ public class WalrusPropertiesBuilder extends S3PropertiesBuilder { protected Properties defaultProperties() { Properties properties = super.defaultProperties(); properties.setProperty(PROPERTY_API_VERSION, "Walrus-1.6"); + properties.setProperty(PROPERTY_ENDPOINT, "http://walrus.partner.eucalyptus.com:8773/services/Walrus"); properties.setProperty(PROPERTY_S3_SERVICE_PATH, "/services/Walrus"); properties.setProperty(PROPERTY_S3_VIRTUAL_HOST_BUCKETS, "false"); return properties; diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml index d3d6c2f344..72e2ab766e 100644 --- a/providers/eucalyptus-partnercloud-ec2/pom.xml +++ b/providers/eucalyptus-partnercloud-ec2/pom.xml @@ -34,14 +34,12 @@ bundle - http://partnercloud.eucalyptus.com:8773/services/Eucalyptus + http://partnercloud.eucalyptus.com:8773/services/Eucalyptus/ 2010-06-15 FIXME_IDENTITY FIXME_CREDENTIAL - - kvm @@ -121,7 +119,6 @@ ${test.eucalyptus-partnercloud-ec2.identity} ${test.eucalyptus-partnercloud-ec2.credential} ${test.eucalyptus-partnercloud-ec2.image-id} - ${test.eucalyptus-partnercloud-ec2.virtualization-type} diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java index 1f9e8036d8..f0094e360c 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java @@ -86,7 +86,7 @@ public class EucalyptusPartnerCloudEC2ProviderMetadata extends BaseProviderMetad */ @Override public URI getConsole() { - return URI.create("https://partnercloud.eucalyptus.com:8443"); + return URI.create("https://eucalyptus.partner.eucalyptus.com"); } /** diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudPropertiesBuilder.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudPropertiesBuilder.java index dfccfef7a5..4a958c4a25 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudPropertiesBuilder.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudPropertiesBuilder.java @@ -38,11 +38,10 @@ public class EucalyptusPartnerCloudPropertiesBuilder extends EucalyptusPropertie @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_REGIONS, "Eucalyptus"); + properties.setProperty(PROPERTY_REGIONS, "eucalyptus"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA"); - properties.setProperty(PROPERTY_REGION + ".Eucalyptus." + ISO3166_CODES, "US-CA"); - properties.setProperty("eucalyptus-partnercloud-ec2.virtualization-type", "kvm"); - properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Eucalyptus"); + properties.setProperty(PROPERTY_REGION + ".eucalyptus." + ISO3166_CODES, "US-CA"); + properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Eucalyptus/"); return properties; } diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/config/EucalyptusPartnerCloudComputeServiceContextModule.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/config/EucalyptusPartnerCloudComputeServiceContextModule.java index f44d4709be..f30683dc4c 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/config/EucalyptusPartnerCloudComputeServiceContextModule.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/config/EucalyptusPartnerCloudComputeServiceContextModule.java @@ -18,30 +18,16 @@ */ package org.jclouds.epc.config; -import static org.jclouds.compute.domain.OsFamily.UBUNTU; - -import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.ec2.compute.config.EC2ComputeServiceContextModule; import org.jclouds.ec2.compute.strategy.ReviseParsedImage; import org.jclouds.epc.strategy.EucalyptusPartnerCloudReviseParsedImage; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.name.Names; - /** * * @author Adrian Cole */ public class EucalyptusPartnerCloudComputeServiceContextModule extends EC2ComputeServiceContextModule { - @Override - protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) { - String virt = injector.getInstance(Key.get(String.class, Names - .named("eucalyptus-partnercloud-ec2.virtualization-type"))); - return template.osFamily(UBUNTU).locationId(virt + "-cluster"); - } - @Override protected void configure() { super.configure(); diff --git a/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java index 80607c2016..242b9e4cb1 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java +++ b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java @@ -18,8 +18,6 @@ */ package org.jclouds.epc.compute; -import java.util.Properties; - import org.jclouds.eucalyptus.compute.EucalyptusComputeServiceLiveTest; import org.testng.annotations.Test; @@ -35,14 +33,4 @@ public class EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest extends Euca // security groups must be <30 characters group = "eu"; } - - @Override - protected Properties setupProperties() { - Properties overrides = super.setupProperties(); - if (System.getProperties().containsKey("test.eucalyptus-partnercloud-ec2.virtualization-type")) - overrides.setProperty("eucalyptus-partnercloud-ec2.virtualization-type", System - .getProperty("test.eucalyptus-partnercloud-ec2.virtualization-type")); - return overrides; - } - } diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml index fa08d91169..4ea9276ec1 100644 --- a/providers/eucalyptus-partnercloud-s3/pom.xml +++ b/providers/eucalyptus-partnercloud-s3/pom.xml @@ -35,7 +35,7 @@ org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer - http://partnercloud.eucalyptus.com:8773/services/Walrus + http://walrus.partner.eucalyptus.com:8773/services/Walrus 2006-03-01 FIXME_IDENTITY diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java index ee788b392e..2df55f8113 100644 --- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java @@ -86,7 +86,7 @@ public class EucalyptusPartnerCloudS3ProviderMetadata extends BaseProviderMetada */ @Override public URI getConsole() { - return URI.create("https://partnercloud.eucalyptus.com:8443"); + return URI.create("https://walrus.partner.eucalyptus.com"); } /** diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusPropertiesBuilder.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusPropertiesBuilder.java index b89f95ba0e..539103fd35 100644 --- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusPropertiesBuilder.java +++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusPropertiesBuilder.java @@ -38,11 +38,11 @@ public class EucalyptusPartnerCloudWalrusPropertiesBuilder extends WalrusPropert @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_REGIONS, "Walrus"); + properties.setProperty(PROPERTY_REGIONS, "walrus"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-CA"); - properties.setProperty(PROPERTY_REGION + ".Walrus." + ISO3166_CODES, "US-CA"); - properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Walrus"); - properties.setProperty(PROPERTY_REGION + "." + "Walrus" + "." + ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Walrus"); + properties.setProperty(PROPERTY_REGION + ".walrus." + ISO3166_CODES, "US-CA"); + properties.setProperty(PROPERTY_ENDPOINT, "http://walrus.partner.eucalyptus.com:8773/services/Walrus"); + properties.setProperty(PROPERTY_REGION + "." + "Walrus" + "." + ENDPOINT, "http://walrus.partner.eucalyptus.com:8773/services/Walrus"); return properties; }