Repository: jclouds-labs Updated Branches: refs/heads/master c45162c1b -> 9caaa469f
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/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 34b59c3..27e6f6b 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 @@ -233,7 +233,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { assertNotNull(uri); assertSent(server, "POST", "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute" + "/virtualMachines/vm/capture?api-version=2016-04-30-preview", - "{\"vhdPrefix\":\"prefix\",\"destinationContainerName\":\"container\"}"); + "{\"vhdPrefix\":\"prefix\",\"destinationContainerName\":\"container\",\"overwriteVhds\":\"true\"}"); } public void testCapture404() throws Exception { @@ -244,7 +244,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { assertNull(uri); assertSent(server, "POST", "/subscriptions/SUBSCRIPTIONID/resourceGroups/groupname/providers/Microsoft.Compute" + "/virtualMachines/vm/capture?api-version=2016-04-30-preview", - "{\"vhdPrefix\":\"prefix\",\"destinationContainerName\":\"container\"}"); + "{\"vhdPrefix\":\"prefix\",\"destinationContainerName\":\"container\",\"overwriteVhds\":\"true\"}"); } private VirtualMachineProperties getProperties() { @@ -252,7 +252,7 @@ public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { ImageReference imgRef = ImageReference.builder().publisher("publisher").offer("offer").sku("sku").version("ver").build(); VHD vhd = VHD.create("https://groupname2760.blob.core.windows.net/vhds/windowsmachine201624102936.vhd";); List<DataDisk> dataDisks = new ArrayList<DataDisk>(); - OSDisk osDisk = OSDisk.create("Windows", "windowsmachine", vhd, "ReadWrite", "FromImage", null, null); + OSDisk osDisk = OSDisk.create("Windows", "windowsmachine", vhd, "ReadWrite", "FromImage", null, null, null); StorageProfile storageProfile = StorageProfile.create(imgRef, osDisk, dataDisks); OSProfile.WindowsConfiguration windowsConfig = OSProfile.WindowsConfiguration.create(false, null, null, true, null); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java index 6006392..754f5fe 100644 --- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java +++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java @@ -32,21 +32,20 @@ import static org.jclouds.oauth.v2.config.OAuthProperties.CREDENTIAL_TYPE; public class AzureLiveTestUtils { - public static Properties defaultProperties(Properties properties) { - properties = properties == null ? new Properties() : properties; - properties.put(CREDENTIAL_TYPE, CLIENT_CREDENTIALS_SECRET.toString()); - properties.put(PROPERTY_REGIONS, "westeurope"); - properties.put(IMAGE_PUBLISHERS, "Canonical"); - properties.put(RESOURCENAME_PREFIX, "jcloudstest"); - - String defaultTimeout = String.valueOf(TimeUnit.MILLISECONDS.convert(60, TimeUnit.MINUTES)); - properties.setProperty(TIMEOUT_SCRIPT_COMPLETE, defaultTimeout); - properties.setProperty(TIMEOUT_NODE_RUNNING, defaultTimeout); - properties.setProperty(TIMEOUT_PORT_OPEN, defaultTimeout); - properties.setProperty(TIMEOUT_NODE_TERMINATED, defaultTimeout); - properties.setProperty(TIMEOUT_NODE_SUSPENDED, defaultTimeout); - - return properties; - } -} + public static Properties defaultProperties(Properties properties, String resourceNamePrefix) { + properties = properties == null ? new Properties() : properties; + properties.put(CREDENTIAL_TYPE, CLIENT_CREDENTIALS_SECRET.toString()); + properties.put(PROPERTY_REGIONS, "westeurope"); + properties.put(IMAGE_PUBLISHERS, "Canonical"); + properties.put(RESOURCENAME_PREFIX, resourceNamePrefix); + + String defaultTimeout = String.valueOf(TimeUnit.MILLISECONDS.convert(60, TimeUnit.MINUTES)); + properties.setProperty(TIMEOUT_SCRIPT_COMPLETE, defaultTimeout); + properties.setProperty(TIMEOUT_NODE_RUNNING, defaultTimeout); + properties.setProperty(TIMEOUT_PORT_OPEN, defaultTimeout); + properties.setProperty(TIMEOUT_NODE_TERMINATED, defaultTimeout); + properties.setProperty(TIMEOUT_NODE_SUSPENDED, defaultTimeout); + return properties; + } +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java index 0633294..cf65462 100644 --- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java +++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java @@ -38,10 +38,8 @@ import org.jclouds.azurecompute.arm.domain.NetworkSecurityRule; import org.jclouds.azurecompute.arm.domain.NetworkSecurityRuleProperties; import org.jclouds.azurecompute.arm.domain.Provisionable; import org.jclouds.azurecompute.arm.domain.ResourceGroup; -import org.jclouds.azurecompute.arm.domain.StorageService; import org.jclouds.azurecompute.arm.domain.Subnet; import org.jclouds.azurecompute.arm.domain.VirtualNetwork; -import org.jclouds.azurecompute.arm.functions.ParseJobStatus; import org.testng.annotations.AfterClass; import com.google.common.base.Predicate; @@ -99,7 +97,7 @@ public class BaseAzureComputeApiLiveTest extends BaseApiLiveTest<AzureComputeApi @Override protected Properties setupProperties() { Properties properties = super.setupProperties(); // for oauth - AzureLiveTestUtils.defaultProperties(properties); + AzureLiveTestUtils.defaultProperties(properties, getClass().getSimpleName().toLowerCase()); checkNotNull(setIfTestSystemPropertyPresent(properties, "oauth.endpoint"), "test.oauth.endpoint"); return properties; } @@ -139,23 +137,6 @@ public class BaseAzureComputeApiLiveTest extends BaseApiLiveTest<AzureComputeApi return subnet; } - protected StorageService createStorageService(final String resourceGroupName, final String storageServiceName, final String location) { - URI uri = api.getStorageAccountApi(resourceGroupName).create(storageServiceName, location, ImmutableMap.of("property_name", - "property_value"), ImmutableMap.of("accountType", StorageService.AccountType.Standard_LRS.toString())); - if (uri != null) { - assertTrue(uri.toString().contains("api-version")); - - boolean jobDone = retry(new Predicate<URI>() { - @Override - public boolean apply(final URI uri) { - return ParseJobStatus.JobStatus.DONE == api.getJobApi().jobStatus(uri); - } - }, 60 * 1 * 1000 /* 1 minute timeout */).apply(uri); - assertTrue(jobDone, "create operation did not complete in the configured timeout"); - } - return api.getStorageAccountApi(resourceGroupName).get(storageServiceName); - } - protected void createTestResourceGroup() { String name = String.format("rg-%s-%s", this.getClass().getSimpleName().toLowerCase(), System.getProperty("user.name")); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/azurecompute-arm/src/test/resources/virtualmachineimagecreate.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachineimagecreate.json b/azurecompute-arm/src/test/resources/virtualmachineimagecreate.json new file mode 100644 index 0000000..865012f --- /dev/null +++ b/azurecompute-arm/src/test/resources/virtualmachineimagecreate.json @@ -0,0 +1,21 @@ +{ + "type": "Microsoft.Compute/images", + "location": "canadaeast", + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/images/testVirtualMachineImage", + "name": "testVirtualMachineImage", + "properties": { + "sourceVirtualMachine": { + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/virtualMachines/vm2image" + }, + "storageProfile": { + "osDisk": { + "osType": "Linux", + "osState": "Generalized", + "blobUri": "https://jcloudstestcanadaeast982.blob.core.windows.net/vhds/vm2image20170315140332.vhd";, + "caching": "ReadWrite" + }, + "dataDisks": [] + }, + "provisioningState": "Succeeded" + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/azurecompute-arm/src/test/resources/virtualmachineimageget.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachineimageget.json b/azurecompute-arm/src/test/resources/virtualmachineimageget.json new file mode 100644 index 0000000..865012f --- /dev/null +++ b/azurecompute-arm/src/test/resources/virtualmachineimageget.json @@ -0,0 +1,21 @@ +{ + "type": "Microsoft.Compute/images", + "location": "canadaeast", + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/images/testVirtualMachineImage", + "name": "testVirtualMachineImage", + "properties": { + "sourceVirtualMachine": { + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/virtualMachines/vm2image" + }, + "storageProfile": { + "osDisk": { + "osType": "Linux", + "osState": "Generalized", + "blobUri": "https://jcloudstestcanadaeast982.blob.core.windows.net/vhds/vm2image20170315140332.vhd";, + "caching": "ReadWrite" + }, + "dataDisks": [] + }, + "provisioningState": "Succeeded" + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/9caaa469/azurecompute-arm/src/test/resources/virtualmachineimagelist.json ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/resources/virtualmachineimagelist.json b/azurecompute-arm/src/test/resources/virtualmachineimagelist.json new file mode 100644 index 0000000..cf4d3ea --- /dev/null +++ b/azurecompute-arm/src/test/resources/virtualmachineimagelist.json @@ -0,0 +1,25 @@ +{ + "value": [ + { + "type": "Microsoft.Compute/images", + "location": "canadaeast", + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/images/imageFromRest", + "name": "testVirtualMachineImage", + "properties": { + "sourceVirtualMachine": { + "id": "/subscriptions/bd81406c-6028-4037-9f03-9a3af4ff725d/resourceGroups/jcloudstest-canadaeast/providers/Microsoft.Compute/virtualMachines/vm2image" + }, + "storageProfile": { + "osDisk": { + "osType": "Linux", + "osState": "Generalized", + "blobUri": "https://jcloudstestcanadaeast982.blob.core.windows.net/vhds/vm2image20170315140332.vhd";, + "caching": "ReadWrite" + }, + "dataDisks": [] + }, + "provisioningState": "Succeeded" + } + } + ] +} \ No newline at end of file
