Skip to content

Fixes for SQL Replication Cmdlets and tests #780

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.

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 28 commits into from
Aug 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9dec2a4
PowerShell for copy and GeoDR
dominiqa Aug 7, 2015
72424de
Review Changes for Replication Cmdlets
dominiqa Aug 7, 2015
6bd2621
Fixing Build Issue
dominiqa Aug 7, 2015
b1d8d9b
Updating Database Replication Test JSONs and streamlining test script…
dominiqa Aug 20, 2015
230e840
Fixing Build Issues from merge and cherry pick changes
dominiqa Aug 20, 2015
6d34a0d
Fixing GetLink Bug for CreateLink
dominiqa Aug 20, 2015
53354d8
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 20, 2015
4703a0c
Updated Wix
dominiqa Aug 20, 2015
b90217e
Adding cmdlet help for GeoDR and DB Copy cmdlets
dominiqa Aug 20, 2015
cfa8f77
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 20, 2015
0a7d629
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 20, 2015
02715f5
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 22, 2015
3399089
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 24, 2015
7b359a1
GeoDR Failover Cmdlets
dominiqa Aug 25, 2015
091e34b
Revert "GeoDR Failover Cmdlets"
dominiqa Aug 25, 2015
2888fb2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 25, 2015
ace3561
reverting wix to base
dominiqa Aug 25, 2015
35799cb
Fixes based on feedback comments
dominiqa Aug 25, 2015
74dfe5d
Updated Wix file
dominiqa Aug 25, 2015
727028d
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 25, 2015
9ba9f01
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 25, 2015
cb732fe
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 26, 2015
0bdb51d
Reverting Bad Merge
dominiqa Aug 26, 2015
aba8a75
recommiting merge
dominiqa Aug 26, 2015
8129ebd
Fixed Merge error
dominiqa Aug 26, 2015
cc4f7b0
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 26, 2015
52ab44b
Fixed SQL Cmdlets installer fix
dominiqa Aug 26, 2015
116a3ab
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dominiqa Aug 26, 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
4 changes: 4 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -2077,6 +2077,9 @@
<Component Id="cmp55FEE041CC305952FE17E655815CE51A" Guid="*">
<File Id="fil14F4B8C7E95C606DDDE47BE166D9F241" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.format.ps1xml" />
</Component>
<Component Id="cmpF23457BA331434DDB0815F84746FD1E7" Guid="*">
<File Id="fil1972DDA29C9A5FC7D61122B5F5E1D84B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml" />
</Component>
<Component Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" Guid="*">
<File Id="fil17C8016A3D5AA097BE35FB83C7539AB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Tags.dll" />
</Component>
Expand Down Expand Up @@ -5475,6 +5478,7 @@
<ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
<ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />
<ComponentRef Id="cmp55FEE041CC305952FE17E655815CE51A" />
<ComponentRef Id="cmpF23457BA331434DDB0815F84746FD1E7" />
<ComponentRef Id="cmp057F4C8C0E8E8DB3E57FD8B64885B30F" />
<ComponentRef Id="cmpC6D3C91080AD47682B7959EF9DF193D3" />
<ComponentRef Id="cmpD7CC32C127B6074C2D5CA20EAA1B14A0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
TypesToProcess = @(
'.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml'
'.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml',
'.\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml'
)

# Format files (.ps1xml) to be loaded when importing this module
Expand Down
28 changes: 28 additions & 0 deletions src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,12 @@
</Compile>
<Compile Include="ScenarioTests\DatabaseActivationTests.cs" />
<Compile Include="ScenarioTests\DatabaseBackupTests.cs" />
<Compile Include="ScenarioTests\DatabaseReplicationTests.cs" />
<Compile Include="ScenarioTests\DatabaseCrudTests.cs" />
<Compile Include="ScenarioTests\DataMaskingTests.cs" />
<None Include="ScenarioTests\DatabaseReplicationTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\LocationCapabilitiesTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -404,6 +408,30 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdateV2.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateDatabaseCopy.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateDatabaseCopyV2.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateSecondaryDatabase.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateSecondaryDatabaseV2.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestGetReplicationLink.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestGetReplicationLinkV2.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestRemoveSecondaryDatabase.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestRemoveSecondaryDatabaseV2.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DataMaskingTests\TestDatabaseDataMaskingBasicRuleLifecycle.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,8 @@ function Get-ElasticPoolName
.SYNOPSIS
Creates a resource group for tests
#>
function Create-ResourceGroupForTest ()
function Create-ResourceGroupForTest ($location = "Japan East")
{
$location = "Japan East"
$rgName = Get-ResourceGroupName

$rg = New-AzureResourceGroup -Name $rgName -Location $location
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.Commands.ScenarioTest.SqlTests;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Xunit;

namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
{
public class DatabaseReplicationTests : SqlTestsBase
{
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestCreateDatabaseCopy()
{
RunPowerShellTest("Test-CreateDatabaseCopy");
}

[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestCreateDatabaseCopyV2()
{
RunPowerShellTest("Test-CreateDatabaseCopyV2");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestCreateSecondaryDatabase()
{
RunPowerShellTest("Test-CreateSecondaryDatabase");
}

[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestCreateSecondaryDatabaseV2()
{
RunPowerShellTest("Test-CreateSecondaryDatabaseV2");
}

[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestGetReplicationLink()
{
RunPowerShellTest("Test-GetReplicationLink");
}

[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestGetReplicationLinkV2()
{
RunPowerShellTest("Test-GetReplicationLinkV2");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRemoveSecondaryDatabase()
{
RunPowerShellTest("Test-RemoveSecondaryDatabase");
}

[Fact]
[Trait(Category.Sql, Category.CheckIn)]
public void TestRemoveSecondaryDatabaseV2()
{
RunPowerShellTest("Test-RemoveSecondaryDatabaseV2");
}
}
}
Loading