Merge pull request #461 from microsoft/dev

minor fixes

Scenarios/AzSHCI and VMFleet/Scenario.ps1

@@ -67,7 +67,8 @@
     Invoke-Command -ComputerName $Nodes[0] -Credential $Credentials -Authentication Credssp -ScriptBlock {
         Install-Fleet #as vmfleet has issues with Install-Fleet -ClusterName https://github.com/microsoft/diskspd/issues/157
         #It's probably more convenient to run this command on cluster as all VHD copying will happen on cluster itself.
-        New-Fleet -BaseVHD "c:\ClusterStorage\Collect\$using:VHDName" -VMs $using:NumberOfVMs -AdminPass P@ssw0rd -Admin Administrator -ConnectUser corp\LabAdmin -ConnectPass LS1setup!
+        #if you will run Measure-FleetCoreWorkload, creating VMs is not necessary
+        #New-Fleet -BaseVHD "c:\ClusterStorage\Collect\$using:VHDName" -VMs $using:NumberOfVMs -AdminPass P@ssw0rd -Admin Administrator -ConnectUser corp\LabAdmin -ConnectPass LS1setup!
     }
 
     # Disable CredSSP

Tools/CreateVMFleetDisk.ps1

@@ -43,13 +43,16 @@ If (!( $isAdmin )) {
         WriteInfoHighlighted "Please select VHD (Windows Server Core) created using CreateParentDisk.ps1 located in ParentDisks folder."
         [reflection.assembly]::loadwithpartialname("System.Windows.Forms")
         $openFile = New-Object System.Windows.Forms.OpenFileDialog -Property @{
-            Title="Please select VHD created by convert-windowsimage. Click cancel if you want to create it"
+            Title="Please select VHD (Windows Server Core) created using CreateParentDisk.ps1 located in ParentDisks folder."
         }
         $openFile.Filter = "vhdx files (*.vhdx)|*.vhdx|All files (*.*)|*.*" 
         If($openFile.ShowDialog() -eq "OK"){
             WriteInfo  "File $($openfile.FileName) selected"
         }
         $VHDPath=$openfile.FileName
+        if (-not ($VHDPath)){
+            WriteErrorAndExit "VHD not selected. Exiting ."
+        }
     #ask for Password that will be configured inside VHD
         WriteInfoHighlighted "Please provide password that will be injected as administrator password into VHD"
         $AdminPassword=Read-Host