Initialize windows disk in Azure ARM - simplify code to not use the ARM API

Author: ivanayov

blockstore/src/main/java/brooklyn/location/blockstore/AbstractVolumeManager.java

@@ -13,7 +13,9 @@
 import org.apache.brooklyn.location.jclouds.JcloudsMachineLocation;
 import org.apache.brooklyn.location.jclouds.JcloudsMachineNamer;
 import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
 import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.internal.winrm.WinRmToolResponse;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,6 +93,14 @@ public void createFilesystem(AttachedBlockDevice attachedDevice, FilesystemOptio
                 throw new RuntimeException(format("Failed to create file system. machine=%s; osDeviceName=%s; filesystemType=%s",
                         machine, osDeviceName, filesystemType));
             }
+        } else if (machine instanceof WinRmMachineLocation) {
+            WinRmToolResponse response = ((WinRmMachineLocation)machine).executeCommand("Get-Disk | Where partitionstyle -eq 'raw' | " +
+                    "Initialize-Disk -PartitionStyle MBR -PassThru | New-Partition -AssignDriveLetter -UseMaximumSize | " +
+                    "Format-Volume -FileSystem NTFS -NewFileSystemLabel \"datadisk\" -Confirm:$false");
+            if (response.getStatusCode() != 0) {
+                throw new RuntimeException(format("Failed to initialize disk. machine=%s; filesystemType=%s",
+                        machine, filesystemOptions.getFilesystemType()));
+            }
         }
     }
 

blockstore/src/main/java/brooklyn/location/blockstore/azure/arm/AzureArmVolumeManager.java

@@ -11,18 +11,15 @@
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.net.UrlEscapers;
 import org.apache.brooklyn.location.jclouds.JcloudsLocation;
 import org.apache.brooklyn.location.jclouds.JcloudsMachineLocation;
-import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.repeat.Repeater;
 import org.apache.brooklyn.util.text.Identifiers;
 import org.apache.brooklyn.util.text.StringShortener;
 import org.apache.brooklyn.util.text.Strings;
 import org.apache.brooklyn.util.time.Duration;
 import org.jclouds.azurecompute.arm.AzureComputeApi;
 import org.jclouds.azurecompute.arm.domain.DataDisk;
-import org.jclouds.azurecompute.arm.domain.Deployment;
 import org.jclouds.azurecompute.arm.domain.Disk;
 import org.jclouds.azurecompute.arm.domain.ManagedDiskParameters;
 import org.jclouds.azurecompute.arm.domain.ResourceGroup;
@@ -31,16 +28,12 @@
 import org.jclouds.azurecompute.arm.domain.VirtualMachine;
 import org.jclouds.azurecompute.arm.domain.VirtualMachineProperties;
 import org.jclouds.azurecompute.arm.features.DiskApi;
-import org.jclouds.azurecompute.arm.features.DeploymentApi;
 import org.jclouds.azurecompute.arm.features.ResourceGroupApi;
 import org.jclouds.azurecompute.arm.features.StorageAccountApi;
 import org.jclouds.azurecompute.arm.features.VirtualMachineApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
@@ -161,11 +154,9 @@ private AttachedBlockDevice createAndAttachBlockDevice(JcloudsMachineLocation ma
         }
 
         int numExistingDisks = coundDataDisks(vm);
-        int lun = numExistingDisks; // starts from 0, so if have one disk already then next will be "1"
+        int lun = numExistingDisks; // starts from 0, so if have one disk already then next will be "1" 
 
-        DeploymentApi deploymentApi = api.getDeploymentApi(resourceGroupName.get());
-
-        Disk disk = addDisk(vmApi, diskApi, vm, options.getSizeInGb(), lun, deploymentApi);
+        Disk disk = addDisk(vmApi, diskApi, vm, options.getSizeInGb(), lun);
 
         BlockDevice blockDevice = new AzureArmBlockDevice(location, disk, resourceGroupName.get(), storageAccountName);
         return blockDevice.attachedTo(machine, getVolumeDeviceName(options.getDeviceSuffix()));
@@ -199,7 +190,7 @@ private void deleteStorageAccount(AzureComputeApi api, String resourceGroupName,
         }
     }
 
-    private Disk addDisk(VirtualMachineApi vmApi, DiskApi diskApi, VirtualMachine vm, int diskSizeGB, int lun, DeploymentApi deploymentApi) {
+    private Disk addDisk(VirtualMachineApi vmApi, DiskApi diskApi, VirtualMachine vm, int diskSizeGB, int lun) {
         String vmName = vm.name();
         VirtualMachineProperties oldProperties = vm.properties();
         StorageProfile oldStorageProfile = oldProperties.storageProfile();
@@ -220,19 +211,7 @@ private Disk addDisk(VirtualMachineApi vmApi, DiskApi diskApi, VirtualMachine vm
         VirtualMachine newVm = vm.toBuilder().properties(newProperties).build();
 
         vmApi.createOrUpdate(vmName, newVm.location(), newVm.properties(), newVm.tags(), newVm.plan());
-        Disk result = waitDiskToAppear(diskApi, diskName, TIMEOUT);
-
-        if (vm.location().contains("Win")) { //TODO make better check
-            String deploymentName = "jc" + System.currentTimeMillis();
-            try {
-                String deploymentTemplate = UrlEscapers.urlFormParameterEscaper().escape(new String(Files.readAllBytes(Paths.get("customscriptextension.json"))));
-                Deployment deployment = deploymentApi.create(deploymentName, deploymentTemplate);
-            } catch (IOException e) {
-                Exceptions.propagate("Failed to read customscriptextension.json", e);
-            }
-        }
-
-        return result;
+        return waitDiskToAppear(diskApi, diskName, TIMEOUT);
     }
 
     private String getRegionName(JcloudsLocation location) {