Skip to content

. #57

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
merged 5 commits into from
Jul 29, 2015
Merged

. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
020af1e
Fix minor documentation errors.
rhencke Jul 26, 2015
cdd0a06
Implemented parameter for ElasticPool in Start-AzureSqlServerUpgrade.
hungmai-msft Jul 18, 2015
478088c
Add documentation for new parameter of Start-AzureSqlServerUpgrade.
hungmai-msft Jul 24, 2015
8668ca7
Merge pull request #651 from rhencke/doc-fixes
Jul 28, 2015
898dff5
Merge pull request #652 from hungmai-msft/upgrade-elastic-pool
Jul 29, 2015
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
6 changes: 3 additions & 3 deletions src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerCrudTests\TestServerUpdate.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeWithUpgradeHint.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServiceTierAdvisorTests\GetUpgradeDatabaseHint.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -419,9 +422,6 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestDatabaseTransparentDataEncryptionUpdate.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeWithRecommendedDatabase.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeAndCancel.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerUpgradeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public class ServerUpgradeTests : SqlTestsBase
{
[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestServerUpgradeWithRecommendedDatabase()
public void TestServerUpgradeWithUpgradeHint()
{
RunPowerShellTest("Test-ServerUpgradeWithRecommendedDatabase");
RunPowerShellTest("Test-ServerUpgradeWithUpgradeHint");
}

[Fact]
Expand Down
45 changes: 24 additions & 21 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerUpgradeTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<#
.SYNOPSIS
Tests upgrading a server with recommended database
Tests upgrading a server with result from upgrade hint cmdlet
#>
function Test-ServerUpgradeWithRecommendedDatabase
function Test-ServerUpgradeWithUpgradeHint
{
# Setup
$server = Create-ServerForServerUpgradeTest
Expand All @@ -28,32 +28,32 @@ function Test-ServerUpgradeWithRecommendedDatabase

try
{
$recommendedDatabase = New-Object -TypeName Microsoft.Azure.Management.Sql.Models.RecommendedDatabaseProperties
$recommendedDatabase.Name = databaseName
$recommendedDatabase.TargetEdition = "Standard"
$recommendedDatabase.TargetServiceLevelObjective = "S0"
$mapping = Get-AzureSqlServerUpgradeHint -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName

Start-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -ServerVersion 12.0 -ScheduleUpgradeAfterUtcDateTime ((Get-Date).AddMinutes(1).ToUniversalTime()) -DatabaseCollection ($recommendedDatabase)
Start-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -ServerVersion 12.0 -ScheduleUpgradeAfterUtcDateTime ((Get-Date).AddMinutes(1).ToUniversalTime()) -DatabaseCollection $mapping.Databases -ElasticPoolCollection $hint.ElasticPools

while ($true)
{
$upgrade = Get-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
if ($upgrade.Status -eq "Completed")
{
# Upgrade is successful
$server = Get-AzureSqlServer -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $server.ServerVersion "12.0"
# Upgrade is successful
$server = Get-AzureSqlServer -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $server.ServerVersion "12.0"
break
}
elseif ($upgrade.Status -eq "Stopped")
elseif ($upgrade.Status -eq "Stopped")
{
# Upgrade failed
$server = Get-AzureSqlServer -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $server.ServerVersion "2.0"
# Upgrade failed
$server = Get-AzureSqlServer -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $server.ServerVersion "2.0"
break
}

Start-Sleep -Seconds 1
if ($env:AZURE_TEST_MODE -eq "Record")
{
Start-Sleep -Seconds 10
}
}
}
finally
Expand All @@ -79,9 +79,9 @@ function Test-ServerUpgradeAndCancel
Assert-AreEqual $upgrade.Status "Queued"

Stop-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -Force
$upgrade = Get-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $upgrade.Status "Cancelling"
$upgrade = Get-AzureSqlServerUpgrade -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $upgrade.Status "Cancelling"

while ($true)
{
Expand All @@ -91,10 +91,13 @@ function Test-ServerUpgradeAndCancel
break
}

Start-Sleep -Seconds 1
if ($env:AZURE_TEST_MODE -eq "Record")
{
Start-Sleep -Seconds 10
}
}

# Upgrade is cancelled
# Upgrade is cancelled
$server = Get-AzureSqlServer -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
Assert-AreEqual $server.ServerVersion "2.0"
}
Expand All @@ -112,7 +115,7 @@ function Test-ServerUpgradeNegative
{
# Setup
$server = Create-ServerForServerUpgradeTest

# Create a basic database
$databaseName = Get-DatabaseName
$database = New-AzureSqlDatabase -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -Edition Basic -MaxSizeBytes 1GB
Expand Down
Loading