Skip to content

Commit 5d5d238

Browse files
authored
set the deleteOption (#20096)
1 parent 821f11b commit 5d5d238

File tree

3 files changed

+595
-1019
lines changed

3 files changed

+595
-1019
lines changed

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ function Test-SimpleNewVmWithDeleteOptions
6363
[string]$domainNameLabel = "$vmname-$vmname".tolower();
6464

6565
# Common
66-
$x = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -NetworkInterfaceDeleteOption "Delete" -OSDiskDeleteOption "Detach" -DataDiskSizeInGb 32 -DataDiskDeleteOption "Delete"
66+
$x = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -NetworkInterfaceDeleteOption "Delete" -OSDiskDeleteOption "Delete" -DataDiskSizeInGb 32 -DataDiskDeleteOption "Delete"
6767

6868
Assert-AreEqual $vmname $x.Name;
6969
Assert-Null $x.Identity
7070
Assert-False { $x.AdditionalCapabilities.UltraSSDEnabled };
7171

7272
Assert-AreEqual $x.NetworkProfile.NetworkInterfaces[0].DeleteOption "Delete"
73-
Assert-AreEqual $x.StorageProfile.OSDisk.DeleteOption "Detach"
73+
Assert-AreEqual $x.StorageProfile.OSDisk.DeleteOption "Delete"
7474

7575
}
7676
finally

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVirtualMachineTests/TestSimpleNewVmWithDeleteOptions.json

Lines changed: 590 additions & 1017 deletions
Large diffs are not rendered by default.

src/Compute/Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
119119
{
120120
Id = imageReferenceId
121121
}),
122+
OsDisk = new OSDisk(
123+
createOption: DiskCreateOptionTypes.FromImage,
124+
deleteOption: osDiskDeleteOption),
122125
DataDisks = DataDiskStrategy.CreateDataDisks(
123126
imageAndOsType?.DataDiskLuns, dataDisks, dataDiskDeleteOption),
124127
DiskControllerType = diskControllerType

0 commit comments

Comments
 (0)