jclouds git commit: JCLOUDS-945: fix local blobstore marker handling

2016-10-12 Thread gaul 
Repository: jclouds
Updated Branches:
  refs/heads/master 26c060a0e -> 50e6d4443


JCLOUDS-945: fix local blobstore marker handling

Previously using prefix markers would not correctly find the next key.
Add test for this behavior.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/50e6d444
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/50e6d444
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/50e6d444

Branch: refs/heads/master
Commit: 50e6d4443343c19d037d35726597e0ff7608dede
Parents: 26c060a
Author: Andrew Gaul 
Authored: Tue Oct 4 20:45:41 2016 -0700
Committer: Andrew Gaul 
Committed: Wed Oct 12 22:22:28 2016 -0700

--
 .../AtmosContainerIntegrationLiveTest.java  |  5 +
 .../blobstore/config/LocalBlobStore.java| 20 +---
 .../internal/BaseContainerIntegrationTest.java  | 18 ++
 .../AzureBlobContainerIntegrationLiveTest.java  |  5 +
 4 files changed, 33 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jclouds/blob/50e6d444/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java
--
diff --git 
a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java
 
b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java
index 4db5244..8561ecd 100644
--- 
a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java
+++ 
b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosContainerIntegrationLiveTest.java
@@ -47,6 +47,11 @@ public class AtmosContainerIntegrationLiveTest extends 
BaseContainerIntegrationT
}
 
@Override
+   public void testListMarkerPrefix() throws Exception {
+  throw new SkipException("cannot specify arbitrary markers");
+   }
+
+   @Override
public void testListContainerWithZeroMaxResults() throws Exception {
   throw new SkipException("Atmos requires a positive integer for max 
results");
}

http://git-wip-us.apache.org/repos/asf/jclouds/blob/50e6d444/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
--
diff --git 
a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java 
b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
index 56b91ff..63f2e3e 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -276,21 +276,11 @@ public final class LocalBlobStore implements BlobStore {
  if (options.getMarker() != null) {
 final String finalMarker = options.getMarker();
 String delimiter = storageStrategy.getSeparator();
-Optional lastMarkerMetadata;
-if (finalMarker.endsWith(delimiter)) {
-   lastMarkerMetadata = tryFind(contents, new 
Predicate() {
-  public boolean apply(StorageMetadata metadata) {
- int length = finalMarker.length() - 1;
- return metadata.getName().substring(0, 
length).compareTo(finalMarker.substring(0, length)) > 0;
-  }
-   });
-} else {
-   lastMarkerMetadata = tryFind(contents, new 
Predicate() {
-  public boolean apply(StorageMetadata metadata) {
- return metadata.getName().compareTo(finalMarker) > 0;
-  }
-   });
-}
+Optional lastMarkerMetadata = tryFind(contents, 
new Predicate() {
+   public boolean apply(StorageMetadata metadata) {
+  return metadata.getName().compareTo(finalMarker) > 0;
+   }
+});
 if (lastMarkerMetadata.isPresent()) {
contents = contents.tailSet(lastMarkerMetadata.get());
 } else {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/50e6d444/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
--
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
index 6ed679b..735784a 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
+++

jclouds-labs git commit: Fixed Azure ARM Image extension

2016-10-12 Thread nacx 
Repository: jclouds-labs
Updated Branches:
  refs/heads/fix/AzureTemplateBuilderLiveTest d9600c00f -> 226633157


Fixed Azure ARM Image extension


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/22663315
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/22663315
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/22663315

Branch: refs/heads/fix/AzureTemplateBuilderLiveTest
Commit: 226633157222d11d6a708fedd5581e61de8672df
Parents: d9600c0
Author: Ignasi Barrera 
Authored: Wed Oct 12 20:33:53 2016 +0200
Committer: Ignasi Barrera 
Committed: Wed Oct 12 20:34:51 2016 +0200

--
 .../arm/AzureComputeProviderMetadata.java   |   2 +-
 .../arm/compute/AzureComputeServiceAdapter.java | 110 ++--
 .../AzureComputeServiceContextModule.java   |  71 
 .../extensions/AzureComputeImageExtension.java  | 177 +--
 .../ResourceDefinitionToCustomImage.java|  76 
 .../arm/compute/functions/VMImageToImage.java   |  25 +--
 .../functions/VirtualMachineToNodeMetadata.java |  50 --
 .../CreateResourceGroupThenCreateNodes.java |  23 +--
 .../azurecompute/arm/domain/VMImage.java|  43 +++--
 .../arm/functions/CleanupResources.java | 157 +++-
 .../azurecompute/arm/util/BlobHelper.java   |  72 
 .../compute/AzureComputeServiceLiveTest.java|  13 +-
 .../AzureComputeImageExtensionLiveTest.java |  56 +++---
 13 files changed, 483 insertions(+), 392 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/22663315/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java
--
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java
index 86f1420..a434079 100644
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java
+++ 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java
@@ -88,7 +88,7 @@ public class AzureComputeProviderMetadata extends 
BaseProviderMetadata {
   properties.setProperty(TCP_RULE_REGEXP, "tcp_\\d{1,5}-\\d{1,5}");
   properties.put(RESOURCE, "https://management.azure.com/;);
   properties.put(CREDENTIAL_TYPE, CLIENT_CREDENTIALS_SECRET.toString());
-  properties.put(RESOURCE_GROUP_NAME, "jcloudsgroup");
+  properties.put(RESOURCE_GROUP_NAME, "jclouds");
   properties.put(DEFAULT_VNET_ADDRESS_SPACE_PREFIX, "10.0.0.0/16");
   properties.put(DEFAULT_SUBNET_ADDRESS_PREFIX, "10.0.0.0/24");
   properties.put(DEFAULT_DATADISKSIZE, "100");

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/22663315/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
--
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
index d21bd43..d6d9267 100644
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
+++ 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java
@@ -19,21 +19,21 @@ package org.jclouds.azurecompute.arm.compute;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterables.contains;
 import static com.google.common.collect.Iterables.filter;
-import static 
org.jclouds.compute.config.ComputeServiceProperties.IMAGE_LOGIN_USER;
-import static 
org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
+import static com.google.common.collect.Iterables.find;
+import static 
org.jclouds.azurecompute.arm.compute.extensions.AzureComputeImageExtension.CONTAINER_NAME;
+import static 
org.jclouds.azurecompute.arm.compute.extensions.AzureComputeImageExtension.CUSTOM_IMAGE_OFFER;
+import static 
org.jclouds.azurecompute.arm.compute.functions.VMImageToImage.decodeFieldsFromUniqueId;
+import static 
org.jclouds.azurecompute.arm.compute.functions.VMImageToImage.encodeFieldsToUniqueIdCustom;
 
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.azurecompute.arm.AzureComputeApi;
-import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata;
 import