Skip to content

. #310

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 11 commits into from
Jan 8, 2016
Merged

. #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db714e5
Re-enable server communication link tests against Stage North europe
adumitr Jan 6, 2016
9d479ce
remove comments from test file
adumitr Jan 6, 2016
7ae3ebd
#5516630 Fix for ARP/Route API calls to return user-friendly output
dihan0604 Jan 7, 2016
1ac80dd
#5367316 Make AccessType parameter mandatory to avoid customer confusion
dihan0604 Jan 7, 2016
401e2dc
Add recorded sessions to project file
adumitr Jan 7, 2016
2348286
Merge branch 'dev' into cross_server_gt
adumitr Jan 7, 2016
c41e822
#0 rename parameter
dihan0604 Jan 7, 2016
78b66aa
Fixes #1410 Updating KeyVault Help
devigned Jan 7, 2016
b09051a
Merge pull request #1598 from adumitr/cross_server_gt
stankovski Jan 7, 2016
b4d6868
Merge pull request #1599 from dihan0604/dev
stankovski Jan 7, 2016
a713788
Merge pull request #1603 from Azure/devigned-patch-1
stankovski Jan 7, 2016
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
2,778 changes: 1,291 additions & 1,487 deletions ...ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.dll-help.xml
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 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 @@ -551,6 +551,15 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.LocationCapabilitiesTests\TestLocationCapabilities.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerCommunicationLinkCrudTests\TestServerCommunicationLinkCreate.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerCommunicationLinkCrudTests\TestServerCommunicationLinkGet.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerCommunicationLinkCrudTests\TestServerCommunicationLinkRemove.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Templates\sql-audit-test-env-setup-storageV2.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
9 changes: 3 additions & 6 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,21 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
{
public class ServerCommunicationLinkCrudTests : SqlTestsBase
{
// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
// [Fact]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestServerCommunicationLinkCreate()
{
RunPowerShellTest("Test-CreateServerCommunicationLink");
}

// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
// [Fact]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestServerCommunicationLinkGet()
{
RunPowerShellTest("Test-GetServerCommunicationLink");
}

// TODO: adumitr: re-enable the tests when feature is fully enabled in the region the tests use
// [Fact]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestServerCommunicationLinkRemove()
{
Expand Down
40 changes: 25 additions & 15 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ServerCommunicationLinkCrudTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
function Test-CreateServerCommunicationLink
{
# Setup
$rg = Create-ResourceGroupForTest
$server = Create-ServerForTest $rg "Japan East"
$server2 = Create-ServerForTest $rg "Japan East"
$locationOverride = "North Europe"
$serverVersion = "12.0"
$rg = Create-ResourceGroupForTest $locationOverride
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride

try
{
Expand All @@ -30,6 +32,7 @@ function Test-CreateServerCommunicationLink
-LinkName $linkName -PartnerServer $server2.ServerName

Assert-NotNull $ep1
Assert-AreEqual $linkName $ep1.Name
Assert-AreEqual $server2.ServerName $ep1.PartnerServer
}
finally
Expand All @@ -45,23 +48,28 @@ function Test-CreateServerCommunicationLink
function Test-GetServerCommunicationLink
{
# Setup
$rg = Create-ResourceGroupForTest
$server = Create-ServerForTest $rg "Japan East"
$server2 = Create-ServerForTest $rg "Japan East"
$locationOverride = "North Europe"
$serverVersion = "12.0"
$rg = Create-ResourceGroupForTest $locationOverride
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride

$linkName = Get-ElasticPoolName
$ep1 = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
-LinkName $linkName -PartnerServer $server2.ServerName
Assert-NotNull $ep1
Assert-AreEqual $linkName $ep1.Name
Assert-AreEqual $server2.ServerName $ep1.PartnerServer

try
{
$gep1 = Get-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
-LinkName $ep1.LinkName
Assert-NotNull $ep1
Assert-AreEqual $server2.ServerName $ep1.PartnerServer
-LinkName $ep1.Name
Assert-NotNull $gep1
Assert-AreEqual $linkName $gep1.Name
Assert-AreEqual $server2.ServerName $gep1.PartnerServer

$all = $server | Get-AzureRmSqlServerCommunicationLink
$all = $server1 | Get-AzureRmSqlServerCommunicationLink
Assert-AreEqual $all.Count 1
}
finally
Expand All @@ -77,9 +85,11 @@ function Test-GetServerCommunicationLink
function Test-RemoveServerCommunicationLink
{
# Setup
$rg = Create-ResourceGroupForTest
$server1 = Create-ServerForTest $rg "Japan East"
$server2 = Create-ServerForTest $rg "Japan East"
$locationOverride = "North Europe"
$serverVersion = "12.0"
$rg = Create-ResourceGroupForTest $locationOverride
$server1 = Create-ServerForTest $rg $serverVersion $locationOverride
$server2 = Create-ServerForTest $rg $serverVersion $locationOverride

$linkName = Get-ElasticPoolName
$ep1 = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
Expand All @@ -88,9 +98,9 @@ function Test-RemoveServerCommunicationLink

try
{
Remove-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName -LinkName $ep1.LinkName -Force
Remove-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName -LinkName $ep1.Name -Force

$all = $server | Get-AzureRmSqlServerCommunicationLink
$all = $server1 | Get-AzureRmSqlServerCommunicationLink
Assert-AreEqual $all.Count 0
}
finally
Expand Down
Loading