Use VolumeEncryptionSettings instead of separate contexts for Windows and Linux

Kamran Khan · Kamran Khan · commit 48c394538450 · 2016-05-25T15:08:05.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
@@ -214,23 +214,14 @@ public override void ExecuteCmdlet()
                 switch (osType)
                 {
                     case OSType.Windows:
-                        AzureDiskEncryptionStatusContext encryptionStatus = new AzureDiskEncryptionStatusContext
-                        {
-                            OsVolumeEncrypted = osVolumeEncrypted,
-                            OsVolumeEncryptionSettings = osVolumeEncryptionSettings,
-                            DataVolumesEncrypted = dataVolumesEncrypted
-                        };
-                        WriteObject(encryptionStatus);
-                        break;
                     case OSType.Linux:
-                        AzureDiskEncryptionStatusLinuxContext encryptionStatusLinux = new AzureDiskEncryptionStatusLinuxContext
+                        AzureDiskEncryptionStatusContext encryptionStatus = new AzureDiskEncryptionStatusContext
                         {
                             OsVolumeEncrypted = osVolumeEncrypted,
-                            OsVolumeEncryptionSettings = null,
                             DataVolumesEncrypted = dataVolumesEncrypted,
-                            DataVolumeEncryptionSettings = osVolumeEncryptionSettings
+                            VolumeEncryptionSettings = osVolumeEncryptionSettings
                         };
-                        WriteObject(encryptionStatusLinux);
+                        WriteObject(encryptionStatus);
                         break;
                     case OSType.Unknown:
                         ThrowTerminatingError(new ErrorRecord(new ApplicationException(string.Format(CultureInfo.CurrentUICulture, "OS type unknown.")),
diff --git a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml
@@ -548,49 +548,18 @@
                 <Label>OsVolumeEncrypted</Label>
                 <PropertyName>OsVolumeEncrypted</PropertyName>
               </ListItem>
-              <ListItem>
-                <Label>OsVolumeEncryptionSettings</Label>
-                <PropertyName>OsVolumeEncryptionSettingsText</PropertyName>
-              </ListItem>
               <ListItem>
                 <Label>DataVolumesEncrypted</Label>
                 <PropertyName>DataVolumesEncrypted</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>VolumeEncryptionSettings</Label>
+                <PropertyName>VolumeEncryptionSettings</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>
       </ListControl>
     </View>
-    <View>
-        <Name>Microsoft.Azure.Commands.Compute.Models.AzureDiskEncryptionStatusLinuxContext</Name>
-        <OutOfBand />
-        <ViewSelectedBy>
-            <TypeName>Microsoft.Azure.Commands.Compute.Models.AzureDiskEncryptionStatusLinuxContext</TypeName>
-        </ViewSelectedBy>
-        <ListControl>
-            <ListEntries>
-                <ListEntry>
-                    <ListItems>
-                        <ListItem>
-                            <Label>OsVolumeEncrypted</Label>
-                            <PropertyName>OsVolumeEncrypted</PropertyName>
-                        </ListItem>
-                        <ListItem>
-                            <Label>OsVolumeEncryptionSettings</Label>
-                            <PropertyName>OsVolumeEncryptionSettingsText</PropertyName>
-                        </ListItem>
-                        <ListItem>
-                            <Label>DataVolumesEncrypted</Label>
-                            <PropertyName>DataVolumesEncrypted</PropertyName>
-                        </ListItem>
-                        <ListItem>
-                            <Label>DataVolumeEncryptionSettings</Label>
-                            <PropertyName>DataVolumeEncryptionSettingsText</PropertyName>
-                        </ListItem>
-                    </ListItems>
-                </ListEntry>
-            </ListEntries>
-        </ListControl>
-    </View>
   </ViewDefinitions>
 </Configuration>
diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/AzureDiskEncryptionStatusContext.cs b/src/ResourceManager/Compute/Commands.Compute/Models/AzureDiskEncryptionStatusContext.cs
@@ -13,14 +13,7 @@ enum EncryptionStatus
     class AzureDiskEncryptionStatusContext
     {
         public EncryptionStatus OsVolumeEncrypted { get; set; }
-        public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }
-        public EncryptionStatus DataVolumesEncrypted { get; set; }
-    }
-    class AzureDiskEncryptionStatusLinuxContext
-    {
-        public EncryptionStatus OsVolumeEncrypted { get; set; }
-        public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }
-        public DiskEncryptionSettings DataVolumeEncryptionSettings { get; set; }
+        public DiskEncryptionSettings VolumeEncryptionSettings { get; set; }
         public EncryptionStatus DataVolumesEncrypted { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,7 @@ enum EncryptionStatus`
`13`	`13`	`class AzureDiskEncryptionStatusContext`
`14`	`14`	`{`
`15`	`15`	`public EncryptionStatus OsVolumeEncrypted { get; set; }`
`16`		`- public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }`
`17`		`- public EncryptionStatus DataVolumesEncrypted { get; set; }`
`18`		`- }`
`19`		`- class AzureDiskEncryptionStatusLinuxContext`
`20`		`- {`
`21`		`- public EncryptionStatus OsVolumeEncrypted { get; set; }`
`22`		`- public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }`
`23`		`- public DiskEncryptionSettings DataVolumeEncryptionSettings { get; set; }`
	`16`	`+ public DiskEncryptionSettings VolumeEncryptionSettings { get; set; }`
`24`	`17`	`public EncryptionStatus DataVolumesEncrypted { get; set; }`
`25`	`18`	`}`
`26`	`19`	`}`