Merge pull request #6842 from vermashi/ade-get-status-fix

Fix for the Get-AzureRmVMDiskEncryptionStatus cmdlet

Author: markcowl

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1

@@ -1052,7 +1052,7 @@ function Test-AzureDiskEncryptionExtensionSinglePass
 		$status = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name
 		Assert-NotNull $status
 		Assert-AreEqual $status.OsVolumeEncrypted Encrypted
-		Assert-AreEqual $status.DataVolumesEncrypted Unknown
+		Assert-AreEqual $status.DataVolumesEncrypted NoDiskFound
 
 		# verify encryption settings 
 		$settings = $status.OsVolumeEncryptionSettings
@@ -1091,6 +1091,7 @@ function Test-AzureDiskEncryptionExtensionSinglePassDisableAndRemove
 		$status = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name
 		Assert-NotNull $status
 		Assert-AreEqual $status.OsVolumeEncrypted Encrypted
+		Assert-AreEqual $status.DataVolumesEncrypted NoDiskFound
 
 		# disable encryption
 		$status = Disable-AzureRmVmDiskEncryption -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name
@@ -1100,6 +1101,7 @@ function Test-AzureDiskEncryptionExtensionSinglePassDisableAndRemove
 		$status = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name
 		Assert-NotNull $status
 		Assert-AreEqual $status.OsVolumeEncrypted NotEncrypted
+		Assert-AreEqual $status.DataVolumesEncrypted NoDiskFound
 
 		# remove extension
 		$status = Remove-AzureRmVmDiskEncryptionExtension -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name

src/ResourceManager/Compute/Commands.Compute/ChangeLog.md

@@ -34,6 +34,7 @@
 * Updated all help files to include full parameter types and correct input/output types.
 * Update description for Set-AzureRmVMOSDisk
 * Update Example 1 for Set-AzureRmVMBginfoExtension to correct spelling and prefix. 
+* Fix Get-AzureRmVMDiskEncryptionStatus cmdlet for certain singlepass related scenarios
 
 ## Version 5.3.0
 * Add -Tag parameter to Update/New-AzureRmAvailabilitySet

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -153,9 +153,9 @@
     <Compile Include="Extension\AzureDiskEncryption\AzureDiskEncryptionExtensionContext.cs" />
     <Compile Include="Extension\AzureDiskEncryption\AzureDiskEncryptionExtensionProtectedSettings.cs" />
     <Compile Include="Extension\AzureDiskEncryption\AzureDiskEncryptionExtensionPublicSettings.cs" />
+    <Compile Include="Extension\AzureDiskEncryption\AzureDiskEncryptionMode.cs" />
     <Compile Include="Extension\AzureDiskEncryption\DisableAzureDiskEncryption.cs" />
     <Compile Include="Extension\AzureDiskEncryption\GetAzureDiskEncryptionStatus.cs" />
-    <Compile Include="Extension\AzureDiskEncryption\OSType.cs" />
     <Compile Include="Extension\AzureDiskEncryption\RemoveAzureDiskEncryptionExtension.cs" />
     <Compile Include="Extension\AzureDiskEncryption\SetAzureDiskEncryptionExtension.cs" />
     <Compile Include="Extension\AzureVMBackup\AzureVMBackupExtensionUtil.cs" />

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/AzureDiskEncryptionMode.cs

@@ -0,0 +1,16 @@
+using Microsoft.Azure.Management.Compute.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.Compute.Extension.AzureDiskEncryption
+{
+    enum AzureDiskEncryptionMode
+    {
+        SinglePass,
+        DualPass,
+        None
+    }
+}

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs

@@ -25,7 +25,8 @@ enum EncryptionStatus
         DecryptionInProgress,
         EncryptionInProgress,
         VMRestartPending,
-        Unknown
+        Unknown,
+        NoDiskFound
     }
 
     class AzureDiskEncryptionStatusContext