From 4cbce53ce6f9068287e518c481c199c076ff85ef Mon Sep 17 00:00:00 2001
From: Moises Aguirre Carmona <mocar@microsoft.com>
Date: Wed, 23 Mar 2016 13:04:18 -0700
Subject: [PATCH] Fixing disable encryption operation when VolumeType is Data

---
 .../DisableAzureDiskEncryption.cs              | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs
index 32259e662546..8df0ad2ef3d2 100644
--- a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs
+++ b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs
@@ -232,15 +232,25 @@ public override void ExecuteCmdlet()
                 {
                     VirtualMachineExtension parameters = GetVmExtensionParameters(virtualMachineResponse);
 
-                    this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
+                    var opExt = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
                                                             this.ResourceGroupName,
                                                             this.VMName,
                                                             this.Name,
                                                             parameters).GetAwaiter().GetResult();
 
-                    var op = UpdateVmEncryptionSettings();
-                    var result = Mapper.Map<PSAzureOperationResponse>(op);
-                    WriteObject(result);
+                    if(string.IsNullOrWhiteSpace(VolumeType) ||
+                        VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeAll, StringComparison.InvariantCultureIgnoreCase) ||
+                        VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeOS, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        var opVm = UpdateVmEncryptionSettings();
+                        var result = Mapper.Map<PSAzureOperationResponse>(opVm);
+                        WriteObject(result);
+                    }
+                    else
+                    {
+                        var result = Mapper.Map<PSAzureOperationResponse>(opExt);
+                        WriteObject(result);
+                    }
                 }
             });
         }