Skip to content

Commit cfe22e5

Browse files
committed
add caching for managed disks
1 parent 7546816 commit cfe22e5

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ function Test-AEMExtensionAdvancedWindowsMD
284284
Assert-AreEqual $extension.Name 'AzureCATExtensionHandler'
285285
$settings = $extension.PublicSettings | ConvertFrom-Json
286286
Assert-NotNull $settings.cfg
287+
Assert-True { ($extension.PublicSettings.Contains("osdisk.caching")) }
287288
Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Get done"
288289

289290
# Test command.

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/SetAzureRmVMAEMExtension.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ public override void ExecuteCmdlet()
215215
{
216216
WriteVerbose("OS Disk Storage Account is a premium account - adding SLAs for OS disk");
217217
var sla = this._Helper.GetDiskSLA(osDiskMD.DiskSizeGB, null);
218+
var caching = osdisk.Caching;
219+
sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.name", Value = this._Helper.GetResourceNameFromId(osdisk.ManagedDisk.Id) });
220+
sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.caching", Value = caching });
218221
sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.type", Value = AEMExtensionConstants.DISK_TYPE_PREMIUM_MD });
219222
sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.sla.throughput", Value = sla.TP });
220223
sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.sla.iops", Value = sla.IOPS });
@@ -238,6 +241,10 @@ public override void ExecuteCmdlet()
238241
{
239242
this._Helper.WriteVerbose("Data Disk {0} is a Premium Managed Disk - adding SLAs for disk", diskNumber.ToString());
240243
var sla = this._Helper.GetDiskSLA(diskMD.DiskSizeGB, null);
244+
var cachingMD = disk.Caching;
245+
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.lun." + diskNumber, Value = disk.Lun });
246+
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.name." + diskNumber, Value = this._Helper.GetResourceNameFromId(disk.ManagedDisk.Id) });
247+
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.caching." + diskNumber, Value = cachingMD });
241248
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.type." + diskNumber, Value = AEMExtensionConstants.DISK_TYPE_PREMIUM_MD });
242249
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.throughput." + diskNumber, Value = sla.TP });
243250
sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.iops." + diskNumber, Value = sla.IOPS });

0 commit comments

Comments
 (0)