Repository: jclouds-labs Updated Branches: refs/heads/fix/AzureTemplateBuilderLiveTest 7bcf96291 -> 5b68d091d
Fixed build Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/5b68d091 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/5b68d091 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/5b68d091 Branch: refs/heads/fix/AzureTemplateBuilderLiveTest Commit: 5b68d091d61b69037c7563f79cdb5e627da88529 Parents: 7bcf962 Author: Ignasi Barrera <[email protected]> Authored: Tue Oct 11 17:21:04 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue Oct 11 17:21:04 2016 +0200 ---------------------------------------------------------------------- .../azurecompute/arm/domain/VirtualMachineInstance.java | 2 +- .../azurecompute/arm/compute/AzureComputeServiceLiveTest.java | 1 + .../azurecompute/arm/features/VirtualMachineApiMockTest.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5b68d091/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java index 4e4a90b..1c11e4d 100644 --- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java +++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java @@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableList; @AutoValue public abstract class VirtualMachineInstance { - @AutoValue + @com.google.auto.value.AutoValue public abstract static class VirtualMachineStatus { public static final String PROVISIONING_STATE_PREFIX = "ProvisioningState/"; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5b68d091/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceLiveTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceLiveTest.java index 66a6e0e..f4f5427 100644 --- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceLiveTest.java +++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceLiveTest.java @@ -56,6 +56,7 @@ import com.google.inject.Module; @Test(groups = "live", singleThreaded = true, testName = "AzureComputeServiceLiveTest") public class AzureComputeServiceLiveTest extends BaseComputeServiceLiveTest { + public AzureComputeServiceLiveTest() { provider = "azurecompute-arm"; nonBlockDurationSeconds = 300; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/5b68d091/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java index c85a103..bb36dc5 100644 --- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java +++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java @@ -93,14 +93,14 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { final VirtualMachineApi vmAPI = api.getVirtualMachineApi("groupname"); assertEquals(vmAPI.list(), getVMList()); assertSent(server, "GET", "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute" + - "/virtualMachines?api-version=2016-06-01"); + "/virtualMachines?api-version=2015-06-15"); } public void testListEmpty() throws Exception { server.enqueue(new MockResponse().setResponseCode(404)); final VirtualMachineApi vmAPI = api.getVirtualMachineApi("groupname"); assertTrue(isEmpty(vmAPI.list())); assertSent(server, "GET", "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute" + - "/virtualMachines?api-version=2016-06-01"); + "/virtualMachines?api-version=2015-06-15"); } public void testCreate() throws Exception { @@ -119,7 +119,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { "\"vhd\":{\"uri\":\"https://groupname2760.blob.core.windows.net/vhds/windowsmachine201624102936.vhd\"},\"caching\":\"ReadWrite\",\"createOption\":\"FromImage\"},\"dataDisks\":[]},"; + "\"osProfile\":{\"computerName\":\"windowsmachine\",\"adminUsername\":\"azureuser\",\"windowsConfiguration\":{\"provisionVMAgent\":false,\"enableAutomaticUpdates\":true}}," + "\"networkProfile\":{\"networkInterfaces\":[{\"id\":\"/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Network/networkInterfaces/windowsmachine167\"}]}," + - "\"diagnosticsProfile\":{\"bootDiagnostics\":{\"enabled\":true,\"storageUri\":\"https://groupname2760.blob.core.windows.net/\"}},\"provisioningState\":\"Creating\"}}";); + "\"diagnosticsProfile\":{\"bootDiagnostics\":{\"enabled\":true,\"storageUri\":\"https://groupname2760.blob.core.windows.net/\"}},\"provisioningState\":\"CREATING\"}}";); }
