Merge pull request #6431 from ejarvi/ade-status-fix

Fix logic bug in Get-AzureRmVMDiskEncryptionStatus

Author: Maddie Clayton

src/ResourceManager/Compute/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* `Get-AzureRmVmDiskEncryptionStatus` fixes an issue observed for VMs with no data disks 
 * Update Compute client library version to fix following cmdlets
     - Grant-AzureRmDiskAccess
     - Grant-AzureRmSnapshotAccess

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 NotEncrypted
+		Assert-AreEqual $status.DataVolumesEncrypted Unknown
 
 		# verify encryption settings 
 		$settings = $status.OsVolumeEncryptionSettings

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

@@ -514,7 +514,7 @@ public override void ExecuteCmdlet()
 
                 // retrieve encryption state using per-disk instance status and report if successful
                 AzureDiskEncryptionStatusContext encryptionStatus = GetStatusFromInstanceView();
-                if (encryptionStatus != null && !(encryptionStatus.OsVolumeEncrypted==EncryptionStatus.Unknown || encryptionStatus.DataVolumesEncrypted==EncryptionStatus.Unknown))
+                if (encryptionStatus != null && (encryptionStatus.OsVolumeEncrypted!=EncryptionStatus.Unknown || encryptionStatus.DataVolumesEncrypted!=EncryptionStatus.Unknown))
                 {
                     encryptionStatus.ProgressMessage = progressMessage;
                     WriteObject(encryptionStatus);