Skip to content

Commit 8ffcc8f

Browse files
VeryEarlyVeryEarly
authored
Merge branch 'release-2021-06-15' into add-opensurvey
2 parents 1b4f366 + df04152 commit 8ffcc8f

File tree

175 files changed

+37417
-19504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+37417
-19504
lines changed

‎src/Accounts/Accounts/AzureRmAlias/Mappings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,7 @@
14941494
"Set-AzLoadBalancerBackendAddressPool": "Set-AzureRmLoadBalancerBackendAddressPool",
14951495
"New-AzLoadBalancerBackendAddressPool": "New-AzureRmLoadBalancerBackendAddressPool",
14961496
"Remove-AzLoadBalancerBackendAddressPool": "Remove-AzureRmLoadBalancerBackendAddressPool",
1497+
"New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig": "New-AzureRmLoadBalancerBackendAddressPoolTunnelInterfaceConfig",
14971498
"New-AzLoadBalancerBackendAddressConfig": "New-AzureRmLoadBalancerBackendAddressConfig",
14981499
"Get-AzLoadBalancerBackendAddressPoolConfig": "Get-AzureRmLoadBalancerBackendAddressPoolConfig",
14991500
"Add-AzLoadBalancerBackendAddressPoolConfig": "Add-AzureRmLoadBalancerBackendAddressPoolConfig",

‎src/ApplicationInsights/ApplicationInsights.Test/ScenarioTests/LinkedStorageAccountTests.ps1

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,22 @@ function Test-LinkedStorageAccountCRUD
5151

5252
Remove-AzApplicationInsightsLinkedStorageAccount -ResourceGroupName $rgname -ComponentName $appName
5353

54+
# Test CRUD by pipeline.
55+
New-AzApplicationInsightsLinkedStorageAccount -InputObject $app -LinkedStorageAccountResourceId $account1.Id
56+
$linkedAccount = Get-AzApplicationInsightsLinkedStorageAccount -InputObject $app
57+
58+
Assert-NotNull $linkedAccount
59+
Assert-AreEqual $account1.Id $linkedAccount.linkedStorageAccount
60+
Assert-AreEqual "serviceprofiler" $linkedAccount.Name
61+
62+
Update-AzApplicationInsightsLinkedStorageAccount -InputObject $app -LinkedStorageAccountResourceId $account2.Id
63+
$linkedAccount = Get-AzApplicationInsightsLinkedStorageAccount -InputObject $app
64+
65+
Assert-NotNull $linkedAccount
66+
Assert-AreEqual $account2.Id $linkedAccount.linkedStorageAccount
67+
68+
Remove-AzApplicationInsightsLinkedStorageAccount -InputObject $app
69+
5470
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $accountName1 -force
5571
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $accountName2 -force
5672

‎src/ApplicationInsights/ApplicationInsights.Test/SessionRecords/Microsoft.Azure.Commands.ApplicationInsights.Test.ScenarioTests.LinkedStorageAccountTests/TestLinkedStorageAccountCRUD.json

Lines changed: 606 additions & 7395 deletions
Large diffs are not rendered by default.

‎src/ApplicationInsights/ApplicationInsights/ApplicationInsights/GetApplicationInsightsLinkedStorageAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public override void ExecuteCmdlet()
7272
this.ResourceId = this.InputObject.Id;
7373
}
7474

75-
if (this.IsParameterBound(c => c.ResourceId))
75+
if (this.IsParameterBound(c => c.ResourceId) || !string.IsNullOrEmpty(this.ResourceId))
7676
{
7777
ResourceIdentifier identifier = new ResourceIdentifier(this.ResourceId);
7878
this.ResourceGroupName = identifier.ResourceGroupName;

‎src/ApplicationInsights/ApplicationInsights/ApplicationInsights/NewApplicationInsightsLinkedStorageAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public override void ExecuteCmdlet()
8181
this.ResourceId = this.InputObject.Id;
8282
}
8383

84-
if (this.IsParameterBound(c => c.ResourceId))
84+
if (this.IsParameterBound(c => c.ResourceId) || !string.IsNullOrEmpty(this.ResourceId))
8585
{
8686
ResourceIdentifier identifier = new ResourceIdentifier(this.ResourceId);
8787
this.ResourceGroupName = identifier.ResourceGroupName;

‎src/ApplicationInsights/ApplicationInsights/ApplicationInsights/RemoveApplicationInsightsLinkedStorageAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()
7171
this.ResourceId = this.InputObject.Id;
7272
}
7373

74-
if (this.IsParameterBound(c => c.ResourceId))
74+
if (this.IsParameterBound(c => c.ResourceId) || !string.IsNullOrEmpty(this.ResourceId))
7575
{
7676
ResourceIdentifier identifier = new ResourceIdentifier(this.ResourceId);
7777
this.ResourceGroupName = identifier.ResourceGroupName;

‎src/ApplicationInsights/ApplicationInsights/ApplicationInsights/UpdateApplicationInsightsLinkedStorageAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public override void ExecuteCmdlet()
8080
this.ResourceId = this.InputObject.Id;
8181
}
8282

83-
if (this.IsParameterBound(c => c.ResourceId))
83+
if (this.IsParameterBound(c => c.ResourceId) || !string.IsNullOrEmpty(this.ResourceId))
8484
{
8585
ResourceIdentifier identifier = new ResourceIdentifier(this.ResourceId);
8686
this.ResourceGroupName = identifier.ResourceGroupName;

‎src/ApplicationInsights/ApplicationInsights/ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed issue that `ResourcegroupName` is missed when executing below cmdlets with `InputObject` parameter [#14848]
22+
* `Get-AzApplicationInsightsLinkedStorageAccount`
23+
* `New-AzApplicationInsightsLinkedStorageAccount`
24+
* `Update-AzApplicationInsightsLinkedStorageAccount`
25+
* `Remove-AzApplicationInsightsLinkedStorageAccount`
2126

2227
## Version 1.1.0
2328
* Added Parameters: `RetentionInDays` `PublicNetworkAccessForIngestion` `PublicNetworkAccessForQuery` for `New-AzApplicationInsights`

‎src/Batch/Batch.Test/Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
1919
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<PsModuleName>Compute</PsModuleName>
@@ -12,9 +12,9 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="46.0.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="47.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ public void TestSimpleNewVm()
3535
TestRunner.RunTestScript("Test-SimpleNewVm");
3636
}
3737

38+
[Fact]
39+
[Trait(Category.AcceptanceType, Category.CheckIn)]
40+
public void TestSimpleNewVmWithDeleteOptions()
41+
{
42+
TestRunner.RunTestScript("Test-SimpleNewVmWithDeleteOptions");
43+
}
44+
3845
[Fact]
3946
[Trait(Category.AcceptanceType, Category.CheckIn)]
4047
public void TestSimpleNewVmFromSIGImage()

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,40 @@ function Test-SimpleNewVm
4646
}
4747
}
4848

49+
<#
50+
.SYNOPSIS
51+
Test Simple Paremeter Set for New Vm
52+
#>
53+
function Test-SimpleNewVmWithDeleteOptions
54+
{
55+
# Setup
56+
$vmname = Get-ResourceName
57+
58+
try
59+
{
60+
$username = "admin01"
61+
$password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
62+
$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
63+
[string]$domainNameLabel = "$vmname-$vmname".tolower();
64+
65+
# Common
66+
$x = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -NetworkInterfaceDeleteOption "Delete" -OSDiskDeleteOption "Detach" -DataDiskSizeInGb 32 -DataDiskDeleteOption "Delete"
67+
68+
Assert-AreEqual $vmname $x.Name;
69+
Assert-Null $x.Identity
70+
Assert-False { $x.AdditionalCapabilities.UltraSSDEnabled };
71+
72+
Assert-AreEqual $x.NetworkProfile.NetworkInterfaces[0].DeleteOption "Delete"
73+
Assert-AreEqual $x.StorageProfile.OSDisk.DeleteOption "Detach"
74+
75+
}
76+
finally
77+
{
78+
# Cleanup
79+
Clean-ResourceGroup $vmname
80+
}
81+
}
82+
4983
<#
5084
.SYNOPSIS
5185
Test Simple Paremeter Set for New Vm

‎src/Compute/Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,11 @@ function Test-AddNetworkInterface
388388

389389
$nicList = Get-AzNetworkInterface -ResourceGroupName $rgname;
390390
$nicList[0].Primary = $true;
391-
$p = Add-AzVMNetworkInterface -VM $p -NetworkInterface $nicList;
391+
$p = Add-AzVMNetworkInterface -VM $p -NetworkInterface $nicList -DeleteOption "Detach";
392392
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
393393
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicList[0].Id;
394394
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Primary $true;
395+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].DeleteOption "Detach";
395396

396397
# Storage Account (SA)
397398
$stoname = 'sto' + $rgname;
@@ -453,6 +454,7 @@ function Test-AddNetworkInterface
453454
Assert-AreEqual $vm1.Name $vmname;
454455
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
455456
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
457+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].DeleteOption "Detach";
456458
}
457459
finally
458460
{
@@ -840,3 +842,5 @@ function Test-VMNicWithAcceleratedNetworkingValidations
840842
Clean-ResourceGroup $rgname
841843
}
842844
}
845+
846+

‎src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,13 @@ public void TestVirtualMachineManagedDiskConversion()
249249
TestRunner.RunTestScript("Test-VirtualMachineManagedDiskConversion");
250250
}
251251

252+
[Fact]
253+
[Trait(Category.AcceptanceType, Category.CheckIn)]
254+
public void TestVirtualMachineDiskDeleteOption()
255+
{
256+
TestRunner.RunTestScript("Test-VirtualMachineDiskDeleteOption");
257+
}
258+
252259
[Fact]
253260
[Trait(Category.AcceptanceType, Category.CheckIn)]
254261
public void TestVirtualMachinePerformanceMaintenance()

‎src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.ps1

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3328,6 +3328,153 @@ function Test-VirtualMachineManagedDiskConversion
33283328
}
33293329
}
33303330

3331+
<#
3332+
.SYNOPSIS
3333+
Test Virtual Machine managed disk delete option
3334+
#>
3335+
function Test-VirtualMachineDiskDeleteOption
3336+
{
3337+
# Setup
3338+
$rgname = Get-ComputeTestResourceName
3339+
3340+
try
3341+
{
3342+
# Common
3343+
if ($loc -eq $null)
3344+
{
3345+
$loc = Get-ComputeVMLocation;
3346+
}
3347+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
3348+
3349+
# VM Profile & Hardware
3350+
$vmsize = 'Standard_A4';
3351+
$vmname = 'vm' + $rgname;
3352+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
3353+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
3354+
3355+
# NRP
3356+
$subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
3357+
$vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
3358+
$subnetId = $vnet.Subnets[0].Id;
3359+
$pubip = New-AzPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
3360+
$pubipId = $pubip.Id;
3361+
$nic = New-AzNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
3362+
$nicId = $nic.Id;
3363+
3364+
$p = Add-AzVMNetworkInterface -VM $p -Id $nicId;
3365+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
3366+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
3367+
3368+
# Adding the same Nic but not set it Primary
3369+
$p = Add-AzVMNetworkInterface -VM $p -Id $nicId -Primary;
3370+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
3371+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
3372+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Primary $true;
3373+
3374+
# Storage Account (SA)
3375+
$stoname = 'sto' + $rgname;
3376+
$stotype = 'Standard_GRS';
3377+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
3378+
$stoaccount = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
3379+
3380+
$osDiskName = 'osDisk';
3381+
$osDiskCaching = 'ReadWrite';
3382+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
3383+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
3384+
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
3385+
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
3386+
3387+
$p = Set-AzVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage -DeleteOption "Delete";
3388+
3389+
$p = Add-AzVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty -DeleteOption "Delete";
3390+
$p = Add-AzVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty -DeleteOption "Detach";
3391+
$p = Add-AzVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
3392+
$p = Remove-AzVMDataDisk -VM $p -Name 'testDataDisk3';
3393+
3394+
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
3395+
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
3396+
Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
3397+
Assert-AreEqual $p.StorageProfile.OSDisk.DeleteOption "Delete";
3398+
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
3399+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
3400+
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
3401+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
3402+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
3403+
Assert-AreEqual $p.StorageProfile.DataDisks[0].DeleteOption "Delete";
3404+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
3405+
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
3406+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
3407+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
3408+
Assert-AreEqual $p.StorageProfile.DataDisks[1].DeleteOption "Detach";
3409+
3410+
# OS & Image
3411+
$user = "Foo12";
3412+
$password = $PLACEHOLDER;
3413+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
3414+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
3415+
$computerName = 'test';
3416+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
3417+
3418+
# $p.StorageProfile.OSDisk = $null;
3419+
$p = Set-AzVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
3420+
3421+
$imgRef = Get-DefaultCRPImage -loc $loc;
3422+
$p = ($imgRef | Set-AzVMSourceImage -VM $p);
3423+
3424+
Assert-AreEqual $p.OSProfile.AdminUsername $user;
3425+
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
3426+
Assert-AreEqual $p.OSProfile.AdminPassword $password;
3427+
3428+
Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
3429+
Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
3430+
Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
3431+
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
3432+
3433+
# Virtual Machine
3434+
New-AzVM -ResourceGroupName $rgname -Location $loc -VM $p;
3435+
3436+
$vm2 = Get-AzVM -Name $vmname -ResourceGroupName $rgname;
3437+
3438+
Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces.Count 1;
3439+
Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces[0].Id $nicId;
3440+
Assert-AreEqual $vm2.StorageProfile.DataDisks.Count 2;
3441+
3442+
Assert-AreEqual $vm2.OSProfile.AdminUsername $user;
3443+
Assert-AreEqual $vm2.OSProfile.ComputerName $computerName;
3444+
Assert-AreEqual $vm2.HardwareProfile.VmSize $vmsize;
3445+
Assert-NotNull $vm2.Location;
3446+
3447+
Assert-Null $vm2.StorageProfile.OSDisk.ManagedDisk
3448+
Assert-Null $vm2.StorageProfile.DataDisks[0].ManagedDisk
3449+
Assert-Null $vm2.StorageProfile.DataDisks[1].ManagedDisk
3450+
3451+
# Deallocate the VM before conversion
3452+
Stop-AzVM -ResourceGroupName $rgname -Name $vmname -Force
3453+
3454+
# Convert VM to managed disks
3455+
$job = ConvertTo-AzVMManagedDisk -ResourceGroupName $rgname -VMName $vmname -AsJob;
3456+
$result = $job | Wait-Job;
3457+
Assert-AreEqual "Completed" $result.State;
3458+
3459+
$vm2 = Get-AzVM -Name $vmname -ResourceGroupName $rgname;
3460+
3461+
Assert-NotNull $vm2.StorageProfile.OSDisk.ManagedDisk
3462+
Assert-AreEqual $vm2.StorageProfile.OSDisk.DeleteOption "Delete"
3463+
Assert-NotNull $vm2.StorageProfile.DataDisks[0].ManagedDisk
3464+
Assert-AreEqual $vm2.StorageProfile.DataDisks[0].DeleteOption "Delete"
3465+
Assert-NotNull $vm2.StorageProfile.DataDisks[1].ManagedDisk
3466+
Assert-AreEqual $vm2.StorageProfile.DataDisks[1].DeleteOption "Detach"
3467+
3468+
# Remove
3469+
Remove-AzVM -ResourceGroupName $rgname -Name $vmname -Force;
3470+
}
3471+
finally
3472+
{
3473+
# Cleanup
3474+
Clean-ResourceGroup $rgname
3475+
}
3476+
}
3477+
33313478
<#
33323479
.SYNOPSIS
33333480
Test Virtual Machine Performance Maintenance

0 commit comments

Comments
 (0)