Skip to content

Commit 5308f8b

Browse files
authored
Merge pull request #11060 from shvenk/master
fix get az-maintenance configuration to honor filters
2 parents 574d9da + fb930af commit 5308f8b

File tree

4 files changed

+420
-3
lines changed

4 files changed

+420
-3
lines changed

src/Maintenance/Maintenance.Test/ScenarioTests/MaintenanceTests.ps1

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ function Test-AzMaintenanceConfiguration
2323
$location = Get-ProviderLocation "Microsoft.Maintenance/MaintenanceConfigurations"
2424
$maintenanceScope = "Host"
2525

26+
$resourceGroupName1 = Get-RandomResourceGroupName
27+
$maintenanceConfigurationName1 = Get-RandomMaintenanceConfigurationName
28+
2629
try
2730
{
2831
New-AzResourceGroup -Name $resourceGroupName -Location $location
@@ -37,16 +40,48 @@ function Test-AzMaintenanceConfiguration
3740
Assert-AreEqual $maintenanceConfigurationCreated.MaintenanceScope $maintenanceScope
3841
Assert-AreEqual $maintenanceConfigurationCreated.Type "Microsoft.Maintenance/MaintenanceConfigurations"
3942

40-
4143
$retrievedMaintenanceConfiguration = Get-AzMaintenanceConfiguration -ResourceGroupName $resourceGroupName -Name $maintenanceConfigurationName
4244
Assert-MaintenanceConfiguration $maintenanceConfigurationCreated $retrievedMaintenanceConfiguration
4345

46+
New-AzResourceGroup -Name $resourceGroupName1 -Location $location
47+
Write-Host "Created RG $location"
48+
49+
$maintenanceConfigurationCreated1 = New-AzMaintenanceConfiguration -ResourceGroupName $resourceGroupName1 -Name $maintenanceConfigurationName1 -MaintenanceScope $maintenanceScope -Location $location
50+
Write-Host "Created configuration $maintenanceConfigurationName1"
51+
Write-Output $maintenanceConfigurationCreated1
52+
53+
Assert-AreEqual $maintenanceConfigurationCreated1.Name $maintenanceConfigurationName1
54+
Assert-AreEqual $maintenanceConfigurationCreated1.Location $location
55+
Assert-AreEqual $maintenanceConfigurationCreated1.MaintenanceScope $maintenanceScope
56+
Assert-AreEqual $maintenanceConfigurationCreated1.Type "Microsoft.Maintenance/MaintenanceConfigurations"
57+
58+
$retrievedMaintenanceConfigurationByRG = Get-AzMaintenanceConfiguration -ResourceGroupName $resourceGroupName
59+
Assert-MaintenanceConfiguration $maintenanceConfigurationCreated $retrievedMaintenanceConfigurationByRG
60+
61+
$retrievedMaintenanceConfigurationByName = Get-AzMaintenanceConfiguration -Name $maintenanceConfigurationName1
62+
Assert-MaintenanceConfiguration $maintenanceConfigurationCreated1 $retrievedMaintenanceConfigurationByName
63+
64+
$allRetrievedMaintenanceConfigurations = Get-AzMaintenanceConfiguration
65+
foreach ($config in $allRetrievedMaintenanceConfigurations)
66+
{
67+
if($config.Name -eq $maintenanceConfigurationName)
68+
{
69+
Assert-MaintenanceConfiguration $maintenanceConfigurationCreated $config
70+
}
71+
else
72+
{
73+
Assert-MaintenanceConfiguration $maintenanceConfigurationCreated1 $config
74+
}
75+
}
76+
4477
Remove-AzMaintenanceConfiguration -ResourceGroupName $resourceGroupName -Name $maintenanceConfigurationName -Force
78+
Remove-AzMaintenanceConfiguration -ResourceGroupName $resourceGroupName1 -Name $maintenanceConfigurationName1 -Force
4579
}
4680
finally
4781
{
4882
# Cleanup
4983
Clean-ResourceGroup $resourceGroupName
84+
Clean-ResourceGroup $resourceGroupName1
5085
}
5186
}
5287

0 commit comments

Comments
 (0)