Merge pull request Azure#4 from moisesac/mocardev

Fixing disable encryption operation when VolumeType is Data
dihan0604 · Mar 23, 2016 · ab27ef2 · ab27ef2
2 parents 893887b + 4cbce53
commit ab27ef2
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/...ager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs b/...ager/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);
+                    }
                 }
             });
         }