Rename OsVolumeEncryptionSettings back for back-compat

Kamran Khan · Kamran Khan · commit c964ea92ae8b · 2016-05-25T16:20:37.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
@@ -219,7 +219,7 @@ public override void ExecuteCmdlet()
                         {
                             OsVolumeEncrypted = osVolumeEncrypted,
                             DataVolumesEncrypted = dataVolumesEncrypted,
-                            VolumeEncryptionSettings = osVolumeEncryptionSettings
+                            OsVolumeEncryptionSettings = osVolumeEncryptionSettings
                         };
                         WriteObject(encryptionStatus);
                         break;
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
@@ -553,8 +553,8 @@
                 <PropertyName>DataVolumesEncrypted</PropertyName>
               </ListItem>
               <ListItem>
-                <Label>VolumeEncryptionSettings</Label>
-                <PropertyName>VolumeEncryptionSettings</PropertyName>
+                <Label>OsVolumeEncryptionSettings</Label>
+                <PropertyName>OsVolumeEncryptionSettings</PropertyName>
               </ListItem>
             </ListItems>
           </ListEntry>
diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/AzureDiskEncryptionStatusContext.cs b/src/ResourceManager/Compute/Commands.Compute/Models/AzureDiskEncryptionStatusContext.cs
@@ -13,7 +13,7 @@ enum EncryptionStatus
     class AzureDiskEncryptionStatusContext
     {
         public EncryptionStatus OsVolumeEncrypted { get; set; }
-        public DiskEncryptionSettings VolumeEncryptionSettings { get; set; }
+        public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }
         public EncryptionStatus DataVolumesEncrypted { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public override void ExecuteCmdlet()`
`219`	`219`	`{`
`220`	`220`	`OsVolumeEncrypted = osVolumeEncrypted,`
`221`	`221`	`DataVolumesEncrypted = dataVolumesEncrypted,`
`222`		`- VolumeEncryptionSettings = osVolumeEncryptionSettings`
	`222`	`+ OsVolumeEncryptionSettings = osVolumeEncryptionSettings`
`223`	`223`	`};`
`224`	`224`	`WriteObject(encryptionStatus);`
`225`	`225`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ enum EncryptionStatus`
`13`	`13`	`class AzureDiskEncryptionStatusContext`
`14`	`14`	`{`
`15`	`15`	`public EncryptionStatus OsVolumeEncrypted { get; set; }`
`16`		`- public DiskEncryptionSettings VolumeEncryptionSettings { get; set; }`
	`16`	`+ public DiskEncryptionSettings OsVolumeEncryptionSettings { get; set; }`
`17`	`17`	`public EncryptionStatus DataVolumesEncrypted { get; set; }`
`18`	`18`	`}`
`19`	`19`	`}`