You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Chris Custine <no...@github.com> on 2014/06/19 01:14:37 UTC
[jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5 (#411)
https://issues.apache.org/jira/browse/JCLOUDS-584
Backport to 1.7.x
You can merge this Pull Request by running:
git pull https://github.com/ccustine/jclouds fixes/JCLOUDS-584-1.7
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/411
-- Commit Summary --
* JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
-- File Changes --
M blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java (11)
M providers/hpcloud-objectstorage/pom.xml (4)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java (29)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java (10)
A providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig (90)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/HPCloudObjectStorageAsyncBlobStore.java (22)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/HPCloudObjectStorageBlobStore.java (14)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageRestClientModule.java (41)
M providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java (4)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/blobstore/HPCloudObjectStorageBlobSignerExpectTest.java (26)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/blobstore/HPCloudObjectStorageBlobStoreExpectTest.java (2)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/blobstore/integration/HPCloudObjectStorageBlobIntegrationLiveTest.java (15)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/blobstore/integration/HPCloudObjectStorageContainerLiveTest.java (10)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/blobstore/integration/HPCloudObjectStorageServiceIntegrationLiveTest.java (7)
A providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/config/HPCloudObjectStorageEndpointModuleTest.java (131)
M providers/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseNoCDN.json (381)
M providers/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseWithCDN.json (411)
M providers/hpcloud-objectstorage/src/test/resources/test_list_cdn.json (6)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/411.patch
https://github.com/jclouds/jclouds/pull/411.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Chris Custine <no...@github.com>.
> +
> +import java.net.URI;
> +import java.util.Properties;
> +
> +import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
> +import org.jclouds.providers.ProviderMetadata;
> +import org.jclouds.providers.internal.BaseProviderMetadata;
> +
> +/**
> +<<<<<<< HEAD
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for StratoGen VMware hosting
> + *
> + * @author Adrian Cole
> +=======
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud
> +>>>>>>> 7d89840... JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
My bad, can't believe I didn't catch that... sorry @jdaggett . Feel free to delete it or I can PR if you like.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14154528
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Gaul <no...@github.com>.
> @@ -70,7 +75,11 @@ public boolean apply(@Nullable StorageMetadata input) {
>
> BlobMetadata metadata = view.getBlobStore().blobMetadata(containerName, "hello");
>
> - assert metadata.getPublicUri() != null : metadata;
> + assertTrue(metadata.getPublicUri() != null, metadata.toString());
Addressed this and some other instances in 8fa209b15ec91829be3810dabc9b423296b58400.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14154614
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
Just a couple of minor comments, which we don't necessarily need to address. The only thing that I think _does_ need fixing is inadvertent commit of [`HPCloudObjectStorageProviderMetadata.java.orig`](https://github.com/jclouds/jclouds/blob/1.7.x/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java.orig)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47024756
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> + fail("static test Strings do not parse to URI: " + ex.getMessage());
> + }
> +
> + expect(mockSupplier.get())
> + .andReturn(endpoints)
> + .anyTimes();
> + expect(mockFactory.createForApiTypeAndVersion(ServiceType.OBJECT_STORE, null))
> + .andReturn(mockSupplier)
> + .anyTimes();
> + expect(mockCDNFactory.createForApiTypeAndVersion(HPExtensionServiceType.CDN, apiVersion))
> + .andReturn(mockSupplier)
> + .anyTimes();
> +
> + replay(mockSupplier);
> + replay(mockFactory);
> + replay(mockCDNFactory);
[minor] `replay(a, b, c)`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14152002
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #1399](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/1399/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47012242
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #928](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/928/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47011556
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #1244](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1244/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-46512896
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Jeremy Daggett <no...@github.com>.
Merged to 1.7.x `fbb4f04`
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47016403
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #904](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/904/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-46508054
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #1276](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1276/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47019625
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Jeremy Daggett <no...@github.com>.
Closed #411.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#event-134704501
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #1375](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/1375/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-46508170
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> @@ -70,7 +75,11 @@ public boolean apply(@Nullable StorageMetadata input) {
>
> BlobMetadata metadata = view.getBlobStore().blobMetadata(containerName, "hello");
>
> - assert metadata.getPublicUri() != null : metadata;
> + assertTrue(metadata.getPublicUri() != null, metadata.toString());
[minor] `assertNotNull`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14151677
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> @@ -27,4 +28,13 @@
> public HPCloudObjectStorageContainerLiveTest() {
> provider = "hpcloud-objectstorage";
> }
> +
> + @Override
> + @Test
[minor] Do we prefer `SkipException` or `@Test(ignored = ...)`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14151912
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> is the inadvertent commit of HPCloudObjectStorageProviderMetadata.java.orig
[Removed](https://git-wip-us.apache.org/repos/asf?p=jclouds.git;a=commit;h=a8ce281904735d0c1954e31bd626f60557352cac)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411#issuecomment-47026686
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> @@ -70,7 +75,11 @@ public boolean apply(@Nullable StorageMetadata input) {
>
> BlobMetadata metadata = view.getBlobStore().blobMetadata(containerName, "hello");
>
> - assert metadata.getPublicUri() != null : metadata;
> + assertTrue(metadata.getPublicUri() != null, metadata.toString());
> +
> + SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class);
> + Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10, SECONDS);
> + assertTrue(socketTester.apply(HostAndPort.fromParts(metadata.getPublicUri().getHost(),80)), metadata.getPublicUri().toString());
[minor] Space before `80`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14151690
Re: [jclouds] JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
(#411)
Posted by Andrew Phillips <no...@github.com>.
> +
> +import java.net.URI;
> +import java.util.Properties;
> +
> +import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
> +import org.jclouds.providers.ProviderMetadata;
> +import org.jclouds.providers.internal.BaseProviderMetadata;
> +
> +/**
> +<<<<<<< HEAD
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for StratoGen VMware hosting
> + *
> + * @author Adrian Cole
> +=======
> + * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud
> +>>>>>>> 7d89840... JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5
Whoops? ;-)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/411/files#r14151717