Skip to content

Commit f0a6be6

Browse files
authored
Enable short policy names for mi mw (#15105)
* Allow short policy names for MI update/create * Update test * Record test * Remove unnecessary ; * Update changelog
1 parent 5d223e1 commit f0a6be6

File tree

4 files changed

+1301
-306
lines changed

4 files changed

+1301
-306
lines changed

src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.ps1

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,9 @@ function Test-CreateUpdateManagedInstanceWithMinimalTlsVersion
400400
function Test-CreateManagedInstanceWithMaintenanceConfigurationId
401401
{
402402
# Setup
403-
$rg = Create-ResourceGroupForTest "westeurope"
404-
$vnetName = "cl_maintenance_configuration"
405-
$subnetName = "ManagedInstance"
406-
407-
# Setup VNET
408-
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
409-
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id
403+
$location = "westeurope"
404+
$rgName = "fmwtestweu"
405+
$subnetId = "/subscriptions/a295933f-f7f5-4994-a109-8fa51241a5d6/resourceGroups/fmwtestweu/providers/Microsoft.Network/virtualNetworks/vnet-fmwnopolicy/subnets/ManagedInstance"
410406

411407
$managedInstanceName = Get-ManagedInstanceName
412408
$version = "12.0"
@@ -415,21 +411,22 @@ function Test-CreateManagedInstanceWithMaintenanceConfigurationId
415411
$storageSizeInGB = 32
416412
$vCore = 8
417413
$skuName = "GP_Gen5"
418-
$maintenanceConfigurationId = "/subscriptions/a295933f-f7f5-4994-a109-8fa51241a5d6/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/MI_Sat_12AM_6AM"
414+
$maintenanceConfigurationId = Get-PublicMaintenanceConfigurationName $location "MI_1"
415+
$expectedMaintenanceConfigurationValue = Get-PublicMaintenanceConfigurationId $location "MI_1"
419416

420417

421418
try
422419
{
423-
$managedInstance1 = New-AzSqlInstance -ResourceGroupName $rg.ResourceGroupName -Name $managedInstanceName `
424-
-Location $rg.Location -AdministratorCredential $credentials -SubnetId $subnetId `
420+
$managedInstance1 = New-AzSqlInstance -ResourceGroupName $rgName -Name $managedInstanceName `
421+
-Location $location -AdministratorCredential $credentials -SubnetId $subnetId `
425422
-LicenseType $licenseType -StorageSizeInGB $storageSizeInGB -Vcore $vCore -SkuName $skuName -AssignIdentity `
426423
-MaintenanceConfigurationId $maintenanceConfigurationId
427424

428425
Assert-AreEqual $managedInstance1.ManagedInstanceName $managedInstanceName
429-
Assert-AreEqual $managedInstance1.MaintenanceConfigurationId "MI_Sat_12AM_6AM"
426+
Assert-AreEqual $managedInstance1.MaintenanceConfigurationId $expectedMaintenanceConfigurationValue
430427
}
431428
finally
432429
{
433-
Remove-ResourceGroupForTest $rg
430+
Remove-AzSqlInstance -ResourceGroupName $rgName -Name $managedInstanceName -Force
434431
}
435432
}

0 commit comments

Comments
 (0)