Parse the encryption status from JSON in substatus field for Linux VMs

Author: Kamran Khan

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

@@ -94,6 +94,7 @@ public AzureDiskEncryptionExtensionContext(PSVirtualMachineExtension psExt)
             ProtectedSettings = psExt.ProtectedSettings;
             ProvisioningState = psExt.ProvisioningState;
             Statuses = psExt.Statuses;
+            SubStatuses = psExt.SubStatuses;
 
             InitializeAzureDiskEncryptionMembers(psExt);
         }

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

@@ -17,8 +17,10 @@
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using Microsoft.Rest.Azure;
+using Newtonsoft.Json;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Management.Automation;
 
@@ -74,7 +76,7 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
 
             VirtualMachineExtension vmExtensionParameters = null;
 
-            if (OperatingSystemTypes.Windows.Equals(currentOSType))
+            if (OSType.Windows.Equals(currentOSType))
             {
                 this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultName;
                 vmExtensionParameters = new VirtualMachineExtension
@@ -87,7 +89,7 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
                     ProtectedSettings = protectedSettings
                 };
             }
-            else if (OperatingSystemTypes.Linux.Equals(currentOSType))
+            else if (OSType.Linux.Equals(currentOSType))
             {
                 this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName;
                 vmExtensionParameters = new VirtualMachineExtension
@@ -104,7 +106,7 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
             return vmExtensionParameters;
         }
 
-        private string GetExtensionStatusMessage(OSType currentOSType)
+        private string GetExtensionStatusMessage(OSType currentOSType, bool returnSubstatusMessage=false)
         {
             AzureOperationResponse<VirtualMachineExtension> extensionResult = this.VirtualMachineExtensionClient.GetWithInstanceView(this.ResourceGroupName, this.VMName, this.Name);
             if (extensionResult == null)
@@ -157,6 +159,12 @@ private string GetExtensionStatusMessage(OSType currentOSType)
                                                           ErrorCategory.InvalidResult,
                                                           null));
                 }
+
+                if (returnSubstatusMessage)
+                {
+                    return context.SubStatuses[0].Message;
+                }
+
                 return context.Statuses[0].Message;
             }
             else
@@ -359,10 +367,13 @@ public override void ExecuteCmdlet()
                             this.Name,
                             parameters).GetAwaiter().GetResult();
 
+                        string encryptionStatusJson = GetExtensionStatusMessage(osType, returnSubstatusMessage: true);
+                        Dictionary<string, string> encryptionStatusParsed = JsonConvert.DeserializeObject<Dictionary<string, string>>(encryptionStatusJson);
+
                         encryptionStatus = new AzureDiskEncryptionStatusContext
                         {
-                            OsVolumeEncrypted = osVolumeEncrypted,
-                            DataVolumesEncrypted = dataVolumesEncrypted,
+                            OsVolumeEncrypted = (EncryptionStatus) Enum.Parse(typeof(EncryptionStatus), encryptionStatusParsed["os"]),
+                            DataVolumesEncrypted = (EncryptionStatus)Enum.Parse(typeof(EncryptionStatus), encryptionStatusParsed["data"]),
                             OsVolumeEncryptionSettings = osVolumeEncryptionSettings,
                             ProgressMessage = GetExtensionStatusMessage(osType)
                         };

src/ResourceManager/Compute/Commands.Compute/Models/AzureDiskEncryptionStatusContext.cs

@@ -21,6 +21,9 @@ enum EncryptionStatus
     {
         Encrypted,
         NotEncrypted,
+        NotMounted,
+        EncryptionInProgress,
+        VMRestartPending,
         Unknown
     }