Handle empty volumeType in extension config

Sudhakara Reddy Evuri · Sudhakara Reddy Evuri · commit 6630f4adc003 · 2015-10-23T20:38:08.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs
@@ -62,10 +62,10 @@ private bool IsAzureDiskEncryptionExtension(VirtualMachineExtension vmExtension)
 
         private bool DataVolumeInExtensionConfig(AzureDiskEncryptionExtensionContext adeExtension)
         {
-            if ((adeExtension != null) &&
-                (adeExtension.VolumeType != null))
+            if (adeExtension != null)
             {
-                if ((adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeData, StringComparison.InvariantCultureIgnoreCase)) ||
+                if ((string.IsNullOrWhiteSpace(adeExtension.VolumeType)) ||
+                    (adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeData, StringComparison.InvariantCultureIgnoreCase)) ||
                     (adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeAll, StringComparison.InvariantCultureIgnoreCase)))
                 {
                     return true;
@@ -90,7 +90,7 @@ private bool ExtensionProvisioningSucceeded(AzureDiskEncryptionExtensionContext
 
         private bool AreDataVolumesEncrypted(VirtualMachine vmParameters)
         {
-            if(vmParameters == null || vmParameters.Extensions == null)
+            if (vmParameters == null || vmParameters.Extensions == null)
             {
                 return false;
             }

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ private bool IsAzureDiskEncryptionExtension(VirtualMachineExtension vmExtension)`
`62`	`62`
`63`	`63`	`private bool DataVolumeInExtensionConfig(AzureDiskEncryptionExtensionContext adeExtension)`
`64`	`64`	`{`
`65`		`- if ((adeExtension != null) &&`
`66`		`- (adeExtension.VolumeType != null))`
	`65`	`+ if (adeExtension != null)`
`67`	`66`	`{`
`68`		`- if ((adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeData, StringComparison.InvariantCultureIgnoreCase)) \|\|`
	`67`	`+ if ((string.IsNullOrWhiteSpace(adeExtension.VolumeType)) \|\|`
	`68`	`+ (adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeData, StringComparison.InvariantCultureIgnoreCase)) \|\|`
`69`	`69`	`(adeExtension.VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeAll, StringComparison.InvariantCultureIgnoreCase)))`
`70`	`70`	`{`
`71`	`71`	`return true;`
`@@ -90,7 +90,7 @@ private bool ExtensionProvisioningSucceeded(AzureDiskEncryptionExtensionContext`
`90`	`90`
`91`	`91`	`private bool AreDataVolumesEncrypted(VirtualMachine vmParameters)`
`92`	`92`	`{`
`93`		`- if(vmParameters == null \|\| vmParameters.Extensions == null)`
	`93`	`+ if (vmParameters == null \|\| vmParameters.Extensions == null)`
`94`	`94`	`{`
`95`	`95`	`return false;`
`96`	`96`	`}`