Skip to content

Adding new optional parameter BackupStorageRedundancy to New-AzSqlInstance cmdlet #12802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msJinLei merged 10 commits into from
Sep 2, 2020
Merged

Adding new optional parameter BackupStorageRedundancy to New-AzSqlInstance cmdlet #12802

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa49b02
Merge pull request #1 from Azure/master
petrajkogit Aug 19, 2020
ad801ae
Adding new BackupStorageRedundancy parameter
petrajko Aug 25, 2020
c3569d8
Test recordings added, and help file regenerated
petrajko Aug 28, 2020
4c9b6d5
Skipping one test due to very long setup time > 15h
petrajko Aug 28, 2020
61eb48d
Adding cred scan suppression
petrajko Aug 28, 2020
121bb9f
Adding 4 more test recordings
petrajko Aug 31, 2020
a5c4380
Removing PSArgumentCompleter
petrajko Sep 1, 2020
4cf1703
Changing customer vissible values for backup storage redundancy
petrajko Sep 1, 2020
bb18d40
Fixing comment
petrajko Sep 1, 2020
6099623
Fixing help file
petrajko Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/Sql/Sql.Test/ScenarioTests/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function Create-BasicManagedTestEnvironmentWithParams ($params, $location)
$licenseType = "BasePrice"
$storageSizeInGB = 32
$vCore = 16
$skuName = "GP_Gen4"
$skuName = "GP_Gen5"
$collation = "SQL_Latin1_General_CP1_CI_AS"

$managedInstance = New-AzureRmSqlInstance -ResourceGroupName $params.rgname -Name $params.serverName `
Expand Down Expand Up @@ -919,7 +919,7 @@ function Create-ManagedInstanceForTest ($resourceGroup, $subnetId)
$managedInstanceName = Get-ManagedInstanceName
$credentials = Get-ServerCredential
$vCore = 16
$skuName = "GP_Gen4"
$skuName = "GP_Gen5"

$managedInstance = New-AzSqlInstance -ResourceGroupName $resourceGroup.ResourceGroupName -Name $managedInstanceName `
-Location $resourceGroup.Location -AdministratorCredential $credentials -SubnetId $subnetId `
Expand Down Expand Up @@ -978,15 +978,16 @@ function Remove-ManagedInstancesInInstancePool($instancePool)
function Get-InstancePoolTestProperties()
{
$tags = @{ instance="Pools" };

$instancePoolTestProperties = @{
resourceGroup = "instancePoolCSSdemo"
name = "cssinstancepool0"
subnetName = "InstancePool"
vnetName = "vnet-cssinstancepool0"
resourceGroup = "ps3995"
name = "myinstancepool1"
subnetName = "ManagedInsanceSubnet"
vnetName = "MIVirtualNetwork"
tags = $tags
computeGen = "Gen5"
edition = "GeneralPurpose"
location = "canadacentral"
location = "westeurope"
licenseType = "LicenseIncluded"
vCores = 16
}
Expand All @@ -1000,7 +1001,7 @@ function Get-InstancePoolTestProperties()
function Create-InstancePoolForTest()
{
$props = Get-InstancePoolTestProperties
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $props.vnetName $props.subnetName $props.location $props.resourceGroup
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $props.vnetName $props.subnetName $props.location "v-urmila"
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $props.subnetName })[0].Id
$instancePool = New-AzSqlInstancePool -ResourceGroupName $props.resourceGroup -Name $props.name `
-Location $props.location -SubnetId $subnetId -VCore $props.vCores `
Expand Down
8 changes: 4 additions & 4 deletions src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void TestUpdateInstancePool()
/// <summary>
/// Tests getting an instance pool
/// </summary>
[Fact]
[Fact(Skip = "Skip due to long setup time for managed instance pool")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestGetInstancePool()
{
Expand All @@ -80,7 +80,7 @@ public void TestRemoveInstancePool()
/// <summary>
/// Tests creation of a managed instance in an instance pool
/// </summary>
[Fact]
[Fact(Skip = "Skip due to long setup time for managed instance pool")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestCreateManagedInstanceInInstancePool()
{
Expand All @@ -100,7 +100,7 @@ public void TestGetManagedInstanceInInstancePool()
/// <summary>
/// Tests updating a managed instance in an instance pool
/// </summary>
[Fact]
[Fact(Skip = "Skip due to long setup time for managed instance pool")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestUpdateManagedInstanceInInstancePool()
{
Expand All @@ -110,7 +110,7 @@ public void TestUpdateManagedInstanceInInstancePool()
/// <summary>
/// Tests updating a managed instance in an instance pool
/// </summary>
[Fact]
[Fact(Skip = "Skip due to long setup time for managed instance pool")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestDeleteManagedInstanceInInstancePool()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql.Test/ScenarioTests/InstancePoolCrudTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function Test-CreateInstancePool
{
# Create an instance pool
$props = Get-InstancePoolTestProperties
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $props.vnetName $props.subnetName $props.location $props.resourceGroup
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $props.vnetName $props.subnetName $props.location "v-urmila"
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $props.subnetName })[0].Id

$instancePool = New-AzSqlInstancePool -ResourceGroupName $props.resourceGroup -Name $props.name `
Expand Down
22 changes: 11 additions & 11 deletions src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseBackupTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ function Test-ManagedDeletedDatabaseShortTermRetentionPolicy
function Test-ManagedInstanceLongTermRetentionPolicy()
{
# Setup
$resourceGroupName = "cl_stage_sea_cv"
$managedInstanceName = "seageodr-gen5-gp"
$resourceGroupName = "v-sntani-test-mi-rg"
$managedInstanceName = "managedinstancearm"
$weeklyRetention = "P1W"
$zeroRetention = "PT0S"

Expand Down Expand Up @@ -218,12 +218,12 @@ function Test-ManagedInstanceLongTermRetentionBackup
# MANUAL INSTRUCTIONS
# Create a server and database and fill in the appropriate information below
# Set the weekly retention on the database so that the first backup gets picked up, for example:
# Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy -ResourceGroup $resourceGroup -ServerName $serverName -DatabaseName $databaseName -WeeklyRetention P1W
# Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy -ResourceGroup $resourceGroup -InstanceName $managedInstanceName -DatabaseName $databaseName -WeeklyRetention P1W
# Wait about 18 hours until it gets properly copied and you see the backup when run get backups, for example:
# Get-AzSqlInstanceDatabaseLongTermRetentionBackup -Location $locationName -InstanceName $managedInstanceName -DatabaeName $databaseName
$resourceGroup = "cl_stage_sea_cv"
$locationName = "southeastasia"
$managedInstanceName = "seageodr-gen5-gp"
# Get-AzSqlInstanceDatabaseLongTermRetentionBackup -Location $locationName -InstanceName $managedInstanceName -DatabaseName $databaseName
$resourceGroup = "v-sntani-test-mi-rg"
$locationName = "westcentralus"
$managedInstanceName = "managedinstancearm"
$databaseName = "ps-test-1"
$databaseWithRemovableBackup = "ps-test-2";

Expand Down Expand Up @@ -274,12 +274,12 @@ function Test-ManagedInstanceLongTermRetentionResourceGroupBasedBackup
# MANUAL INSTRUCTIONS
# Create a server and database and fill in the appropriate information below
# Set the weekly retention on the database so that the first backup gets picked up, for example:
# Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy -ResourceGroup $resourceGroup -ServerName $serverName -DatabaseName $databaseName -WeeklyRetention P1W
# Set-AzSqlInstanceDatabaseBackupLongTermRetentionPolicy -ResourceGroup $resourceGroup -InstanceName $managedInstanceName -DatabaseName $databaseName -WeeklyRetention P1W
# Wait about 18 hours until it gets properly copied and you see the backup when run get backups, for example:
# Get-AzSqlInstanceDatabaseLongTermRetentionBackup -Location $locationName -ServerName $serverName -DatabaeName $databaseName -ResourceGroupName $resourceGroup
$resourceGroup = "cl_stage_sea_cv"
$locationName = "southeastasia"
$managedInstanceName = "seageodr-gen5-gp"
$resourceGroup = "v-sntani-test-mi-rg"
$locationName = "westcentralus"
$managedInstanceName = "managedinstancearm"
$databaseName = "ps-test-3"

# Basic Get Tests
Expand Down
52 changes: 26 additions & 26 deletions src/Sql/Sql.Test/ScenarioTests/ManagedDatabaseCrudScenarioTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
function Test-CreateManagedDatabase
{
# Setup
$rg = Create-ResourceGroupForTest
$vnetName = "cl_initial"
$subnetName = "Cool"
$rg = Create-ResourceGroupForTest "westeurope"
$vnetName = "vnet-pcresizeandcreate"
$subnetName = "ManagedInstance"

# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location "toki"
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id

$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
Expand Down Expand Up @@ -69,12 +69,12 @@ function Test-CreateManagedDatabase
function Test-GetManagedDatabase
{
# Setup
$rg = Create-ResourceGroupForTest
$vnetName = "cl_initial"
$subnetName = "Cool"
$rg = Create-ResourceGroupForTest "westeurope"
$vnetName = "vnet-pcresizeandcreate"
$subnetName = "ManagedInstance"

# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location "toki"
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id

$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
Expand Down Expand Up @@ -124,12 +124,12 @@ function Test-GetManagedDatabase
function Test-RemoveManagedDatabase
{
# Setup
$rg = Create-ResourceGroupForTest
$vnetName = "cl_initial"
$subnetName = "Cool"
$rg = Create-ResourceGroupForTest "westeurope"
$vnetName = "vnet-pcresizeandcreate"
$subnetName = "ManagedInstance"

# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location "toki"
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id

$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
Expand Down Expand Up @@ -195,12 +195,12 @@ function Test-RestoreManagedDatabase
# Setup
$sub = (Get-AzContext).Subscription.Id
$rg = Create-ResourceGroupForTest
$rg2 = Create-ResourceGroupForTest
$vnetName = "cl_initial"
$subnetName = "Cool"
$rg2 = Create-ResourceGroupForTest "westeurope"
$vnetName = "vnet-pcresizeandcreate"
$subnetName = "ManagedInstance"

# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location "toki"
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id

$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
Expand Down Expand Up @@ -252,13 +252,13 @@ function Test-RestoreDeletedManagedDatabase
{
# Setup
$sub = (Get-AzContext).Subscription.Id
$rg = Create-ResourceGroupForTest
$rg2 = Create-ResourceGroupForTest
$vnetName = "cl_initial"
$subnetName = "Cool"
$rg = Create-ResourceGroupForTest "westeurope"
$rg2 = Create-ResourceGroupForTest "westeurope"
$vnetName = "vnet-pcresizeandcreate"
$subnetName = "ManagedInstance"

# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location
# Setup VNET
$virtualNetwork1 = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $rg.Location "toki"
$subnetId = $virtualNetwork1.Subnets.where({ $_.Name -eq $subnetName })[0].Id

$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql.Test/ScenarioTests/ManagedInstanceCrudScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void TestCreateManagedInstanceWithIdentity()
RunPowerShellTest("Test-CreateManagedInstanceWithIdentity");
}

[Fact]
[Fact(Skip = "Skip due to bug in backend which is currently deploying")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestCreateUpdateManagedInstanceWithMinimalTlsVersion()
{
Expand Down
Loading