Skip to content

Commit 2924738

Browse files
MiYanniMiYanni
authored
Merge pull request #7287 from huang91shu/DMS_Sync
Update DataMigration PS to 2018-07-15-preview for Sync Migrations
2 parents d5514f1 + d992e83 commit 2924738

File tree

64 files changed

+34069
-12307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+34069
-12307
lines changed

‎src/ResourceManager/DataMigration/Commands.DataMigration.Test/Commands.DataMigration.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.DataMigration" Version="0.1.2-preview" />
27+
<PackageReference Include="Microsoft.Azure.Management.DataMigration" Version="0.4.0-preview" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/ResourceManager/DataMigration/Commands.DataMigration.Test/Commands.DataMigration.Test.csproj

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<SignAssembly>false</SignAssembly>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="Microsoft.Azure.Management.DataMigration, Version=0.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataMigration.0.3.0-preview\lib\net452\Microsoft.Azure.Management.DataMigration.dll</HintPath>
51+
<Reference Include="Microsoft.Azure.Management.DataMigration, Version=0.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataMigration.0.4.0-preview\lib\net452\Microsoft.Azure.Management.DataMigration.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -86,8 +86,56 @@
8686
<None Include="ScenarioTests\ServiceTests.ps1">
8787
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8888
</None>
89-
<None Include="SessionRecords\**\*.json">
90-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
89+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestConnectToSourceSqlServer.json">
90+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
91+
</None>
92+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestConnectToSourceSqlServerSync.json">
93+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
94+
</None>
95+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestConnectToTargetSqlDb.json">
96+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
97+
</None>
98+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestConnectToTargetSqlDbMi.json">
99+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
100+
</None>
101+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestConnectToTargetSqlDbSync.json">
102+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
103+
</None>
104+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestCreateAndGetProjectSqlSqlDb.json">
105+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
106+
</None>
107+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestCreateAndGetService.json">
108+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109+
</None>
110+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestGetUserTableSyncTask.json">
111+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112+
</None>
113+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestGetUserTableTask.json">
114+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
115+
</None>
116+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestMigrateSqlSqlDb.json">
117+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
118+
</None>
119+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestMigrateSqlSqlDbMi.json">
120+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121+
</None>
122+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestMigrateSqlSqlDBSync.json">
123+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
124+
</None>
125+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestRemoveProject.json">
126+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
127+
</None>
128+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestRemoveService.json">
129+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130+
</None>
131+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestStopStartService.json">
132+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
133+
</None>
134+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestValidateMigrationInputSqlSqlDbMi.json">
135+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
136+
</None>
137+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DmsTest.ServiceTests\TestValidateMigrationInputSqlSqlDbSync.json">
138+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
91139
</None>
92140
</ItemGroup>
93141
<ItemGroup>

‎src/ResourceManager/DataMigration/Commands.DataMigration.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function Create-DataMigrationService($rg)
7575
}else{
7676
$serviceName = Get-ServiceName
7777
$virtualSubNetId = [Microsoft.Azure.Commands.DataMigrationConfig]::GetConfigString("VIRTUAL_SUBNET_ID")
78-
$sku = "Basic_2vCores"
78+
$sku = "BusinessCritical_4vCores"
7979
$service = New-AzureRmDataMigrationService -ResourceGroupName $rg.ResourceGroupName -ServiceName $ServiceName -Location $rg.Location -Sku $sku -VirtualSubnetId $virtualSubNetId
8080
}
8181

‎src/ResourceManager/DataMigration/Commands.DataMigration.Test/ScenarioTests/ServiceTests.cs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,40 @@ public void TestValidateMigrationInputSqlSqlDbMi()
112112
{
113113
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-ValidateMigrationInputSqlSqlDbMi");
114114
}
115+
116+
[Fact]
117+
[Trait(Category.AcceptanceType, Category.CheckIn)]
118+
public void TestConnectToSourceSqlServerSync()
119+
{
120+
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-ConnectToSourceSqlServerSync");
121+
}
122+
123+
[Fact]
124+
[Trait(Category.AcceptanceType, Category.CheckIn)]
125+
public void TestConnectToTargetSqlDbSync()
126+
{
127+
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-ConnectToTargetSqlDbSync");
128+
}
129+
130+
[Fact]
131+
[Trait(Category.AcceptanceType, Category.CheckIn)]
132+
public void TestGetUserTableSyncTask()
133+
{
134+
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-GetUserTableSyncTask");
135+
}
136+
137+
[Fact]
138+
[Trait(Category.AcceptanceType, Category.CheckIn)]
139+
public void TestValidateMigrationInputSqlSqlDbSync()
140+
{
141+
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-ValidateMigrationInputSqlSqlDbSync");
142+
}
143+
144+
[Fact]
145+
[Trait(Category.AcceptanceType, Category.CheckIn)]
146+
public void TestMigrateSqlSqlDBSync()
147+
{
148+
DataMigrationTestController.NewInstance.RunPsTest(_logger, "Test-MigrateSqlSqlDBSync");
149+
}
115150
}
116151
}

0 commit comments

Comments
 (0)