Adds drive-letter options when adding additional hard disk on Windows

Author: nakomis

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

@@ -94,21 +94,28 @@ public void createFilesystem(AttachedBlockDevice attachedDevice, FilesystemOptio
                         machine, osDeviceName, filesystemType));
             }
         } else if (machine instanceof WinRmMachineLocation) {
+            String driveLetter = filesystemOptions.getMountPoint();
+            String driveLetterParam = Strings.isNullOrEmpty(driveLetter) ? "-AssignDriveLetter" : "-DriveLetter " + driveLetter;
+            String volumeLabel = filesystemOptions.getVolumeLabel();
+            String volumeLabelParam = Strings.isNullOrEmpty(volumeLabel) ? "datadisk" : volumeLabel;
             WinRmToolResponse response = ((WinRmMachineLocation)machine).executePsScript("Get-Disk | Where partitionstyle -eq 'raw' | " +
-                    "Initialize-Disk -PartitionStyle MBR -PassThru | New-Partition -AssignDriveLetter -UseMaximumSize | " +
-                    "Format-Volume -FileSystem NTFS -NewFileSystemLabel \"datadisk\" -Confirm:$false");
+                    "Initialize-Disk -PartitionStyle MBR -PassThru | New-Partition " + driveLetterParam + " -UseMaximumSize | " +
+                    "Format-Volume -FileSystem " + filesystemOptions.getFilesystemType() +" -NewFileSystemLabel \"" + volumeLabelParam + "\" -Confirm:$false");
             if (response.getStatusCode() != 0) {
-                throw new RuntimeException(format("Failed to initialize disk. machine=%s; filesystemType=%s",
-                        machine, filesystemOptions.getFilesystemType()));
+                throw new RuntimeException(format("Failed to initialize disk. machine=%s; filesystemType=%s; stdErr=%s;",
+                        machine, filesystemOptions.getFilesystemType(), response.getStdErr()));
             }
+        } else {
+            throw new IllegalStateException("Cannot create filesystem for " + machine + " of type "
+                    + machine.getClass().getName() + "; expected " + SshMachineLocation.class.getSimpleName()
+                    + " or " + WinRmMachineLocation.class.getSimpleName());
         }
     }
 
     @Override
     public MountedBlockDevice mountFilesystem(AttachedBlockDevice attachedDevice, FilesystemOptions options) {
         JcloudsMachineLocation machine = attachedDevice.getMachine();
         if (machine instanceof SshMachineLocation) {
-
             LOG.debug("Mounting filesystem: device={}; options={}", attachedDevice, options);
             String osDeviceName = getOSDeviceName(attachedDevice.getDeviceSuffix());
             String mountPoint = options.getMountPoint();
@@ -132,6 +139,12 @@ public MountedBlockDevice mountFilesystem(AttachedBlockDevice attachedDevice, Fi
                 throw new RuntimeException(format("Failed to mount file system. machine=%s; osDeviceName=%s; mountPoint=%s; filesystemType=%s",
                         attachedDevice.getMachine(), osDeviceName, mountPoint, filesystemType));
             }
+        } else if (machine instanceof WinRmMachineLocation) {
+            LOG.debug("Ignoring mounting of filesystem on WinRmMachineLocation: device={}; options={}", attachedDevice, options);
+        } else {
+            throw new IllegalStateException("Cannot mount filesystem for " + machine + " of type "
+                    + machine.getClass().getName() + "; expected " + SshMachineLocation.class.getSimpleName()
+                    + " or " + WinRmMachineLocation.class.getSimpleName());
         }
 
         return attachedDevice.mountedAt(options.getMountPoint());

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

@@ -5,17 +5,20 @@
 import java.util.Map;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.base.Optional;
 
 public class FilesystemOptions {
 
     private String mountPoint;
     private String filesystemType;
+    private String volumeLabel;
 
     // For more convenient yaml input
     public static FilesystemOptions fromMap(Map<String, ?> map) {
         FilesystemOptions result = new FilesystemOptions();
         result.mountPoint = (String) map.get("mountPoint");
         result.filesystemType = (String) map.get("filesystemType");
+        result.volumeLabel = (String) map.get("volumeLabel");
         return result;
     }
 
@@ -31,23 +34,42 @@ public FilesystemOptions(String mountPoint) {
     }
 
     public FilesystemOptions(String mountPoint, String filesystemType) {
+        this(mountPoint, filesystemType, "");
+    }
+
+    public FilesystemOptions(String mountPoint, String filesystemType, String volumeLabel) {
         this.filesystemType = checkNotNull(filesystemType, "filesystemType");
         this.mountPoint = checkNotNull(mountPoint, "mountPoint");
+        this.volumeLabel = Optional.fromNullable(volumeLabel).or("");
     }
 
+    /*
+    For Linux machines, this will be the mount point, e.g. /data. For Windows systems, this is the drive letter, e.g. "G". A colon should not be included
+     */
     public String getMountPoint() {
         return mountPoint;
     }
 
+    /*
+    For Linux machines, this will be the file system type, e.g. ext3. For Windows system, this is the `-FileSystem` parameter passed to the `Format-Volume` cmdlet, e.g. NTFS
+     */
     public String getFilesystemType() {
         return filesystemType;
     }
 
+    /*
+    Windows only. The volume label to be assigned to the volume, e.g. "MyDataDrive"
+     */
+    public String getVolumeLabel() {
+        return volumeLabel;
+    }
+
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("mountPoint", mountPoint)
                 .add("filesystemType", filesystemType)
+                .add("volumeLabel", volumeLabel)
                 .toString();
     }
 }