date:20161014

[jclouds-labs] Git Push Summary

2016-10-14 Thread nacx

Repository: jclouds-labs
Updated Branches:
  refs/heads/fix/AzureTemplateBuilderLiveTest [deleted] 820300612

[4/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

2016-10-14 Thread nacx

Refactored Azure ARM to not use Deployments

* Simplified ImageExtension
* Fixed access to deployed VMS
* Made api-version configurable for all apis"
* Fixed all feature live tests
* Fixed the AzureComputeServiceLiveTest
* Fixed the AzureTemplateBuilderLiveTest
* Fixed the AzureComputeImageExtensionLiveTest


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

Branch: refs/heads/master
Commit: 2f110387381c4778c68c2287f616193d6474bd5f
Parents: 5742745
Author: Andrea Turli 
Authored: Wed Sep 28 18:20:26 2016 +0200
Committer: Ignasi Barrera 
Committed: Fri Oct 14 11:43:00 2016 +0200

--
 azurecompute-arm/README.md  |   6 +-
 azurecompute-arm/pom.xml|   7 +-
 .../azurecompute/arm/AzureComputeApi.java   |  17 +-
 .../arm/AzureComputeProviderMetadata.java   |  68 ++-
 .../arm/compute/AzureComputeServiceAdapter.java | 348 ++-
 .../AzureComputeServiceContextModule.java   | 143 +++--
 .../extensions/AzureComputeImageExtension.java  | 178 +++---
 .../functions/DeploymentToNodeMetadata.java | 244 
 .../functions/DeploymentToVMDeployment.java | 121 
 .../ResourceDefinitionToCustomImage.java|  78 +++
 .../arm/compute/functions/VMImageToImage.java   |  76 +--
 .../functions/VirtualMachineToNodeMetadata.java | 279 +
 .../compute/options/AzureTemplateOptions.java   |  54 +-
 .../predicates/IsDeploymentInRegions.java   |   1 +
 ...DefaultLoginCredentialsForImageStrategy.java |  43 --
 .../CreateResourceGroupThenCreateNodes.java |  97 +++-
 .../arm/config/AzureComputeHttpApiModule.java   |   3 -
 .../arm/config/AzureComputeProperties.java  |   9 +-
 .../azurecompute/arm/domain/VMDeployment.java   |  38 +-
 .../azurecompute/arm/domain/VMImage.java|  43 +-
 .../azurecompute/arm/domain/VirtualMachine.java |   7 +-
 .../arm/domain/VirtualMachineInstance.java  |  51 +-
 .../arm/domain/VirtualMachineProperties.java|  27 +-
 .../arm/features/DeploymentApi.java |   5 +-
 .../azurecompute/arm/features/JobApi.java   |   7 +-
 .../azurecompute/arm/features/LocationApi.java  |   7 +-
 .../arm/features/NetworkInterfaceCardApi.java   |  31 +-
 .../arm/features/NetworkSecurityGroupApi.java   |  46 +-
 .../arm/features/NetworkSecurityRuleApi.java|  38 +-
 .../azurecompute/arm/features/OSImageApi.java   |   5 +-
 .../arm/features/PublicIPAddressApi.java|  29 +-
 .../arm/features/ResourceGroupApi.java  |  19 +-
 .../arm/features/ResourceProviderApi.java   |  24 +-
 .../arm/features/StorageAccountApi.java |  35 +-
 .../azurecompute/arm/features/SubnetApi.java|  33 +-
 .../azurecompute/arm/features/VMSizeApi.java|  20 +-
 .../arm/features/VirtualMachineApi.java |  35 +-
 .../arm/features/VirtualNetworkApi.java |  35 +-
 .../arm/filters/ApiVersionFilter.java   |  90 +++
 .../arm/functions/CleanupResources.java | 210 ---
 .../StorageProfileToStorageAccountName.java |  38 ++
 .../azurecompute/arm/util/BlobHelper.java   |  86 ++-
 .../arm/util/DeploymentTemplateBuilder.java | 573 ---
 .../azurecompute/arm/util/GetEnumValue.java |   1 -
 .../compute/AzureComputeServiceLiveTest.java|  76 ++-
 .../compute/AzureTemplateBuilderLiveTest.java   |  49 +-
 .../AzureComputeImageExtensionLiveTest.java |  69 +--
 .../arm/features/DeploymentApiLiveTest.java |  92 ++-
 .../features/DeploymentTemplateBuilderTest.java | 287 --
 .../NetworkSecurityGroupApiMockTest.java|   2 -
 .../features/PublicIPAddressApiMockTest.java|   3 +-
 .../features/ResourceProviderAPIMockTest.java   |   1 -
 .../arm/features/StorageAccountApiMockTest.java |  35 --
 .../arm/features/SubnetApiMockTest.java |  17 +-
 .../TemplateToDeploymentTemplateLiveTest.java   | 281 -
 .../arm/features/VirtualMachineApiLiveTest.java |  71 +--
 .../arm/features/VirtualMachineApiMockTest.java |  47 +-
 .../arm/features/VirtualNetworkApiMockTest.java |   2 +-
 .../arm/filters/ApiVersionFilterTest.java   | 129 +
 .../internal/BaseAzureComputeApiMockTest.java   |  19 +-
 60 files changed, 1881 insertions(+), 2604 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/README.md
--
diff --git a/azurecompute-arm/README.md b/azurecompute-arm/README.md
index b1c0916..a5a9956 100644
--- a/azurecompute-arm/README.md
+++ b/azurecompute-arm/README.md
@@ -32,8 +32,7 @@ azure ad app create --name

[1/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

2016-10-14 Thread nacx

Repository: jclouds-labs
Updated Branches:
  refs/heads/master 5742745e0 -> 2f1103873


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/DeploymentTemplateBuilderTest.java
--
diff --git 
a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/DeploymentTemplateBuilderTest.java
 
b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/DeploymentTemplateBuilderTest.java
deleted file mode 100644
index 1657899..000
--- 
a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/DeploymentTemplateBuilderTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.azurecompute.arm.features;
-
-import java.util.List;
-import java.util.Map;
-
-import org.jclouds.azurecompute.arm.compute.options.AzureTemplateOptions;
-import org.jclouds.azurecompute.arm.domain.DeploymentBody;
-import org.jclouds.azurecompute.arm.domain.ImageReference;
-import org.jclouds.azurecompute.arm.domain.IpConfiguration;
-import org.jclouds.azurecompute.arm.domain.IpConfigurationProperties;
-import org.jclouds.azurecompute.arm.domain.NetworkInterfaceCardProperties;
-import org.jclouds.azurecompute.arm.domain.PublicIPAddressProperties;
-import org.jclouds.azurecompute.arm.domain.ResourceDefinition;
-import org.jclouds.azurecompute.arm.domain.StorageService;
-import 
org.jclouds.azurecompute.arm.domain.StorageService.StorageServiceProperties;
-import org.jclouds.azurecompute.arm.domain.VirtualMachineProperties;
-import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
-import org.jclouds.azurecompute.arm.util.DeploymentTemplateBuilder;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.domain.internal.TemplateImpl;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-@Test(groups = "unit", testName = "DeploymentTemplateBuilderTest", 
singleThreaded = true)
-public class DeploymentTemplateBuilderTest extends BaseAzureComputeApiMockTest 
{
-
-   final String group = "jcgroup";
-   final String vnetName = group + "virtualnetwork";
-   final String subnetId = "";
-
-   @Test
-   public void testResourceGroup() {
-  DeploymentTemplateBuilder builder = 
getMockDeploymentTemplateBuilderWithEmptyOptions();
-  DeploymentBody deploymentBody = builder.getDeploymentTemplate();
-  List resources = 
deploymentBody.template().resources();
-  Map variables = deploymentBody.template().variables();
-
-  ResourceDefinition resource = getResourceByType(resources, 
"Microsoft.Storage/storageAccounts");
-
-  StorageServiceProperties properties = (StorageServiceProperties) 
resource.properties();
-  assertEquals(properties.accountType(), 
StorageService.AccountType.Standard_LRS);
-  assertTrue(variables.containsKey(parseVariableName(resource.name(;
-   }
-
-   @Test
-   void testPublicIpAddress() {
-  DeploymentTemplateBuilder builder = 
getMockDeploymentTemplateBuilderWithEmptyOptions();
-  DeploymentBody deploymentBody = builder.getDeploymentTemplate();
-  List resources = 
deploymentBody.template().resources();
-  Map variables = deploymentBody.template().variables();
-
-  ResourceDefinition resource = getResourceByType(resources, 
"Microsoft.Network/publicIPAddresses");
-
-  PublicIPAddressProperties properties = (PublicIPAddressProperties) 
resource.properties();
-  assertEquals(properties.publicIPAllocationMethod(),

[3/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

2016-10-14 Thread nacx

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
--
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
new file mode 100644
index 000..cce6b50
--- /dev/null
+++ 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.azurecompute.arm.compute.functions;
+
+import static 
org.jclouds.azurecompute.arm.compute.extensions.AzureComputeImageExtension.CUSTOM_IMAGE_OFFER;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.jclouds.azurecompute.arm.AzureComputeApi;
+import 
org.jclouds.azurecompute.arm.compute.config.AzureComputeServiceContextModule.AzureComputeConstants;
+import org.jclouds.azurecompute.arm.domain.ResourceDefinition;
+import org.jclouds.azurecompute.arm.domain.VMImage;
+import org.jclouds.azurecompute.arm.domain.VirtualMachine;
+import 
org.jclouds.azurecompute.arm.functions.StorageProfileToStorageAccountName;
+import org.jclouds.compute.domain.Image;
+
+import com.google.common.base.Function;
+import com.google.inject.assistedinject.Assisted;
+
+public class ResourceDefinitionToCustomImage implements 
Function {
+
+   public interface Factory {
+  ResourceDefinitionToCustomImage create(@Assisted("nodeId") String 
nodeId, @Assisted("imageName") String imageName);
+   }
+
+   private final String resourceGroup;
+   private final Function vmImageToImage;
+   private final String imageName;
+   private final String storageAccountName;
+   private final VirtualMachine vm;
+
+   @Inject
+   ResourceDefinitionToCustomImage(AzureComputeApi api, AzureComputeConstants 
azureComputeConstants,
+ StorageProfileToStorageAccountName storageProfileToStorageAccountName,
+ Function vmImageToImage, @Assisted("nodeId") String 
nodeId,
+ @Assisted("imageName") String imageName) {
+  this.vmImageToImage = vmImageToImage;
+  this.resourceGroup = azureComputeConstants.azureResourceGroup();
+  this.imageName = imageName;
+  this.vm = api.getVirtualMachineApi(resourceGroup).get(nodeId);
+  this.storageAccountName = 
storageProfileToStorageAccountName.apply(vm.properties().storageProfile());
+   }
+
+   @SuppressWarnings("unchecked")
+   @Override
+   public Image apply(ResourceDefinition input) {
+  VMImage.Builder builder = 
VMImage.customImage().group(resourceGroup).storage(storageAccountName).name(imageName)
+.offer(CUSTOM_IMAGE_OFFER).location(vm.location());
+
+  Map properties = (Map) 
input.properties();
+
+  Object storageObject = properties.get("storageProfile");
+  Map storageProperties = (Map) 
storageObject;
+
+  Object osDiskObject = storageProperties.get("osDisk");
+  Map osProperties = (Map) osDiskObject;
+  builder.vhd1(osProperties.get("name"));
+
+  return vmImageToImage.apply(builder.build());
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
--
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
index f784842..9d9eceb 100644
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
+++ 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
@@ -16,58 +16,50 @@
  */
 package

[4/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

2016-10-14 Thread nacx

Refactored Azure ARM to not use Deployments

* Simplified ImageExtension
* Fixed access to deployed VMS
* Made api-version configurable for all apis"
* Fixed all feature live tests
* Fixed the AzureComputeServiceLiveTest
* Fixed the AzureTemplateBuilderLiveTest
* Fixed the AzureComputeImageExtensionLiveTest


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

Branch: refs/heads/azure-rebased
Commit: 2f110387381c4778c68c2287f616193d6474bd5f
Parents: 5742745
Author: Andrea Turli 
Authored: Wed Sep 28 18:20:26 2016 +0200
Committer: Ignasi Barrera 
Committed: Fri Oct 14 11:43:00 2016 +0200

--
 azurecompute-arm/README.md  |   6 +-
 azurecompute-arm/pom.xml|   7 +-
 .../azurecompute/arm/AzureComputeApi.java   |  17 +-
 .../arm/AzureComputeProviderMetadata.java   |  68 ++-
 .../arm/compute/AzureComputeServiceAdapter.java | 348 ++-
 .../AzureComputeServiceContextModule.java   | 143 +++--
 .../extensions/AzureComputeImageExtension.java  | 178 +++---
 .../functions/DeploymentToNodeMetadata.java | 244 
 .../functions/DeploymentToVMDeployment.java | 121 
 .../ResourceDefinitionToCustomImage.java|  78 +++
 .../arm/compute/functions/VMImageToImage.java   |  76 +--
 .../functions/VirtualMachineToNodeMetadata.java | 279 +
 .../compute/options/AzureTemplateOptions.java   |  54 +-
 .../predicates/IsDeploymentInRegions.java   |   1 +
 ...DefaultLoginCredentialsForImageStrategy.java |  43 --
 .../CreateResourceGroupThenCreateNodes.java |  97 +++-
 .../arm/config/AzureComputeHttpApiModule.java   |   3 -
 .../arm/config/AzureComputeProperties.java  |   9 +-
 .../azurecompute/arm/domain/VMDeployment.java   |  38 +-
 .../azurecompute/arm/domain/VMImage.java|  43 +-
 .../azurecompute/arm/domain/VirtualMachine.java |   7 +-
 .../arm/domain/VirtualMachineInstance.java  |  51 +-
 .../arm/domain/VirtualMachineProperties.java|  27 +-
 .../arm/features/DeploymentApi.java |   5 +-
 .../azurecompute/arm/features/JobApi.java   |   7 +-
 .../azurecompute/arm/features/LocationApi.java  |   7 +-
 .../arm/features/NetworkInterfaceCardApi.java   |  31 +-
 .../arm/features/NetworkSecurityGroupApi.java   |  46 +-
 .../arm/features/NetworkSecurityRuleApi.java|  38 +-
 .../azurecompute/arm/features/OSImageApi.java   |   5 +-
 .../arm/features/PublicIPAddressApi.java|  29 +-
 .../arm/features/ResourceGroupApi.java  |  19 +-
 .../arm/features/ResourceProviderApi.java   |  24 +-
 .../arm/features/StorageAccountApi.java |  35 +-
 .../azurecompute/arm/features/SubnetApi.java|  33 +-
 .../azurecompute/arm/features/VMSizeApi.java|  20 +-
 .../arm/features/VirtualMachineApi.java |  35 +-
 .../arm/features/VirtualNetworkApi.java |  35 +-
 .../arm/filters/ApiVersionFilter.java   |  90 +++
 .../arm/functions/CleanupResources.java | 210 ---
 .../StorageProfileToStorageAccountName.java |  38 ++
 .../azurecompute/arm/util/BlobHelper.java   |  86 ++-
 .../arm/util/DeploymentTemplateBuilder.java | 573 ---
 .../azurecompute/arm/util/GetEnumValue.java |   1 -
 .../compute/AzureComputeServiceLiveTest.java|  76 ++-
 .../compute/AzureTemplateBuilderLiveTest.java   |  49 +-
 .../AzureComputeImageExtensionLiveTest.java |  69 +--
 .../arm/features/DeploymentApiLiveTest.java |  92 ++-
 .../features/DeploymentTemplateBuilderTest.java | 287 --
 .../NetworkSecurityGroupApiMockTest.java|   2 -
 .../features/PublicIPAddressApiMockTest.java|   3 +-
 .../features/ResourceProviderAPIMockTest.java   |   1 -
 .../arm/features/StorageAccountApiMockTest.java |  35 --
 .../arm/features/SubnetApiMockTest.java |  17 +-
 .../TemplateToDeploymentTemplateLiveTest.java   | 281 -
 .../arm/features/VirtualMachineApiLiveTest.java |  71 +--
 .../arm/features/VirtualMachineApiMockTest.java |  47 +-
 .../arm/features/VirtualNetworkApiMockTest.java |   2 +-
 .../arm/filters/ApiVersionFilterTest.java   | 129 +
 .../internal/BaseAzureComputeApiMockTest.java   |  19 +-
 60 files changed, 1881 insertions(+), 2604 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/README.md
--
diff --git a/azurecompute-arm/README.md b/azurecompute-arm/README.md
index b1c0916..a5a9956 100644
--- a/azurecompute-arm/README.md
+++ b/azurecompute-arm/README.md
@@ -32,8 +32,7 @@ azure ad app create

jclouds git commit: reduce payload for GET VirtualGuests

2016-10-14 Thread andreaturli

Repository: jclouds
Updated Branches:
  refs/heads/1.9.x c79b23559 -> a843196bf


reduce payload for GET VirtualGuests


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

Branch: refs/heads/1.9.x
Commit: a843196bf6f7a618ed68472b6832ba76f60627e2
Parents: c79b235
Author: Andrea Turli 
Authored: Thu Oct 13 22:03:44 2016 +0200
Committer: Andrea Turli 
Committed: Fri Oct 14 10:46:54 2016 +0200

--
 .../jclouds/softlayer/features/AccountApi.java  |  2 +-
 .../softlayer/features/AccountApiMockTest.java  |  4 +-
 .../src/test/resources/logback-test.xml | 42 
 .../softlayer/src/test/resources/logback.xml| 34 
 4 files changed, 45 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jclouds/blob/a843196b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
--
diff --git 
a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
 
b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
index 05f01e0..f8c883f 100644
--- 
a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
+++ 
b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
@@ -45,7 +45,7 @@ public interface AccountApi {
 
String GUEST_MASK = 
"children.blockDevices.diskImage.softwareReferences.softwareDescription";
String LIST_GUEST_MASK = 
"powerState;operatingSystem.passwords;datacenter;billingItem;blockDevices" +
-   ".diskImage;tagReferences";
+   ".diskImage;tagReferences.tag.name";
 
/**
 * @return an account's associated virtual guest objects.

http://git-wip-us.apache.org/repos/asf/jclouds/blob/a843196b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
--
diff --git 
a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
 
b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
index 46ca8e4..6c6d867 100644
--- 
a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
+++ 
b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
@@ -41,7 +41,7 @@ public class AccountApiMockTest extends BaseSoftLayerMockTest 
{
   AccountApi api = getAccountApi(server);
   try {
  assertEquals(api.listVirtualGuests(), new 
VirtualGuestsParseTest().expected());
- assertSent(server, "GET", 
"/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences");
+ assertSent(server, "GET", 
"/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences.tag.name");
   } finally {
  server.shutdown();
   }
@@ -52,7 +52,7 @@ public class AccountApiMockTest extends BaseSoftLayerMockTest 
{
   AccountApi api = getAccountApi(server);
   try {
  assertTrue(api.listVirtualGuests().isEmpty());
- assertSent(server, "GET", 
"/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences");
+ assertSent(server, "GET", 
"/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences.tag.name");
   } finally {
  server.shutdown();
   }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/a843196b/providers/softlayer/src/test/resources/logback-test.xml
--
diff --git a/providers/softlayer/src/test/resources/logback-test.xml 
b/providers/softlayer/src/test/resources/logback-test.xml
new file mode 100644
index 000..4cac342
--- /dev/null
+++ b/providers/softlayer/src/test/resources/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+target/test-data/jclouds.log
+
+%d %-5p [%c] [%thread] %m%n
+
+
+
+target/test-data/jclouds-wire.log
+
+%d %-5p [%c] [%thread] %m%n
+
+
+
+target/jclouds-compute.log
+
+%d %-5p [%c] [%thread] %m%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

[jclouds-labs] Git Push Summary

[4/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

[1/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

[3/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

[4/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments

jclouds git commit: reduce payload for GET VirtualGuests

6 matches

Site Navigation

Mail list logo

Footer information