Skip to content

Commit b23c52e

Browse files
DeepakRajendranMsftcormacpayne
DeepakRajendranMsft
authored and
cormacpayne
committed
Add migration cmdlets (#2721)
* Minor fixes and enable tests * Add migration cmdlets for resesrvedip, routes and nsg and update ASM network SDK * update tests * fix csprojs * fix tests and add help * fix comments, tests and add help * fix more tests * Add tests to migration cmdlets * omit pass1word from help file * Add credscanner filter * Add credscanner filter * remove unused ref in packages.config from ServiceManagement/Services/Commands * Add shouldprocess for migration network cmdlets * update tests * fix failing tests
1 parent 0400dc9 commit b23c52e

File tree

58 files changed

+80885
-110812
lines changed

Some content is hidden

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

58 files changed

+80885
-110812
lines changed

‎src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<SpecificVersion>False</SpecificVersion>
120120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.13.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
121121
</Reference>
122-
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
122+
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.8.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
124124
<Private>True</Private>
125125
</Reference>
126126
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
@@ -334,6 +334,15 @@
334334
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationAbortAzureVNet.json">
335335
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
336336
</None>
337+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationAzureReservedIP.json">
338+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
339+
</None>
340+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationNetworkSecurityGroup.json">
341+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
342+
</None>
343+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationRouteTable.json">
344+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
345+
</None>
337346
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationValidateAzureDeployment.json">
338347
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
339348
</None>
@@ -546,7 +555,7 @@
546555
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
547556
</None>
548557
<None Include="Resources\ServiceManagement\ServiceManagementTests.ps1">
549-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
558+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
550559
</None>
551560
<None Include="Resources\ServiceManagement\Common.ps1">
552561
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -651,4 +660,4 @@
651660
<ItemGroup />
652661
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
653662
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
654-
</Project>
663+
</Project>

‎src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,91 @@ function Test-MigrationAbortAzureStorageAccount
826826
Remove-AzureStorageAccount -StorageAccountName $storageName;
827827
}
828828

829+
<#
830+
.SYNOPSIS
831+
Tests Move-AzureNetworkSecurityGroup
832+
#>
833+
function Test-MigrationNetworkSecurityGroup
834+
{
835+
# Setup
836+
$securityGroupName = getAssetName
837+
$location = Get-DefaultLocation
838+
New-AzureNetworkSecurityGroup -Name $securityGroupName -location $location
839+
840+
# Validate move
841+
$status = Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Validate
842+
Assert-NotNull $status
843+
Assert-Null $status.ValidationMessages
844+
845+
# Prepare move
846+
Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Prepare
847+
848+
# Abort Move
849+
Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Abort
850+
851+
# Remove
852+
$isDeleted = Remove-AzureNetworkSecurityGroup -Name $securityGroupName -Force -PassThru
853+
}
854+
855+
<#
856+
.SYNOPSIS
857+
Tests Move-AzureRouteTable
858+
#>
859+
function Test-MigrationRouteTable
860+
{
861+
# Setup
862+
$routeTableName = getAssetName
863+
$location = Get-DefaultLocation
864+
New-AzureRouteTable -Name $routeTableName -location $location
865+
866+
# Validate move
867+
$status = Move-AzureRouteTable -RouteTableName $routeTableName -Validate
868+
Assert-NotNull $status
869+
Assert-Null $status.ValidationMessages
870+
871+
# Prepare move
872+
Move-AzureRouteTable -RouteTableName $routeTableName -Prepare
873+
874+
# Abort Move
875+
Move-AzureRouteTable -RouteTableName $routeTableName -Abort
876+
877+
# Remove
878+
$isDeleted = Remove-AzureRouteTable -Name $routeTableName -Force -PassThru
879+
}
880+
881+
<#
882+
.SYNOPSIS
883+
Tests Move-AzureReservedIP
884+
#>
885+
function Test-MigrationAzureReservedIP
886+
{
887+
# Setup
888+
$name = getAssetName
889+
$location = Get-DefaultLocation
890+
891+
# Test Create Reserved IP
892+
New-AzureReservedIP -ReservedIPName $name -Location $location
893+
$reservedIP = Get-AzureReservedIP -ReservedIPName $name
894+
895+
# Assert
896+
Assert-NotNull($reservedIP)
897+
Assert-AreEqual $reservedIP.Location $location
898+
899+
# Validate move
900+
$status = Move-AzureReservedIP -ReservedIPName $name -Validate
901+
Assert-NotNull $status
902+
Assert-Null $status.ValidationMessages
903+
904+
# Prepare move
905+
Move-AzureReservedIP -ReservedIPName $name -Prepare
906+
907+
# Abort Move
908+
Move-AzureReservedIP -ReservedIPName $name -Abort
909+
910+
#Test Remove reserved IP
911+
$removeReservedIP = Remove-AzureReservedIP -ReservedIPName $name -Force
912+
Assert-AreEqual $removeReservedIP.OperationStatus "Succeeded"
913+
}
829914

830915
function Test-NewAzureVMWithBYOL
831916
{

‎src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,33 @@ public void TestMigrateAzureVNet()
178178
this.RunPowerShellTest("Test-MigrateAzureVNet");
179179
}
180180

181+
[Fact]
182+
[Trait(Category.Service, Category.ServiceManagement)]
183+
[Trait(Category.AcceptanceType, Category.CheckIn)]
184+
[Trait(Category.AcceptanceType, Category.BVT)]
185+
public void TestMigrationNetworkSecurityGroup()
186+
{
187+
this.RunPowerShellTest("Test-MigrationNetworkSecurityGroup");
188+
}
189+
190+
[Fact]
191+
[Trait(Category.Service, Category.ServiceManagement)]
192+
[Trait(Category.AcceptanceType, Category.CheckIn)]
193+
[Trait(Category.AcceptanceType, Category.BVT)]
194+
public void TestMigrationAzureReservedIP()
195+
{
196+
this.RunPowerShellTest("Test-MigrationAzureReservedIP");
197+
}
198+
199+
[Fact]
200+
[Trait(Category.Service, Category.ServiceManagement)]
201+
[Trait(Category.AcceptanceType, Category.CheckIn)]
202+
[Trait(Category.AcceptanceType, Category.BVT)]
203+
public void TestMigrationRouteTable()
204+
{
205+
this.RunPowerShellTest("Test-MigrationRouteTable");
206+
}
207+
181208
[Fact]
182209
[Trait(Category.Service, Category.ServiceManagement)]
183210
[Trait(Category.AcceptanceType, Category.CheckIn)]

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrateAzureDeployment.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrateAzureVNet.json

Lines changed: 19 additions & 19 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationAbortAzureVNet.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"3165"
9696
],
9797
"x-ms-version": [
98-
"2016-03-01"
98+
"2016-07-01"
9999
],
100100
"User-Agent": [
101101
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -142,7 +142,7 @@
142142
"217"
143143
],
144144
"x-ms-version": [
145-
"2016-03-01"
145+
"2016-07-01"
146146
],
147147
"User-Agent": [
148148
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -183,7 +183,7 @@
183183
"RequestBody": "",
184184
"RequestHeaders": {
185185
"x-ms-version": [
186-
"2016-03-01"
186+
"2016-07-01"
187187
],
188188
"User-Agent": [
189189
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -227,7 +227,7 @@
227227
"RequestBody": "",
228228
"RequestHeaders": {
229229
"x-ms-version": [
230-
"2016-03-01"
230+
"2016-07-01"
231231
],
232232
"User-Agent": [
233233
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -271,7 +271,7 @@
271271
"RequestBody": "",
272272
"RequestHeaders": {
273273
"x-ms-version": [
274-
"2016-03-01"
274+
"2016-07-01"
275275
],
276276
"User-Agent": [
277277
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -315,7 +315,7 @@
315315
"RequestBody": "",
316316
"RequestHeaders": {
317317
"x-ms-version": [
318-
"2016-03-01"
318+
"2016-07-01"
319319
],
320320
"User-Agent": [
321321
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -359,7 +359,7 @@
359359
"RequestBody": "",
360360
"RequestHeaders": {
361361
"x-ms-version": [
362-
"2016-03-01"
362+
"2016-07-01"
363363
],
364364
"User-Agent": [
365365
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -403,7 +403,7 @@
403403
"RequestBody": "",
404404
"RequestHeaders": {
405405
"x-ms-version": [
406-
"2016-03-01"
406+
"2016-07-01"
407407
],
408408
"User-Agent": [
409409
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -488,7 +488,7 @@
488488
"RequestBody": "",
489489
"RequestHeaders": {
490490
"x-ms-version": [
491-
"2016-03-01"
491+
"2016-07-01"
492492
],
493493
"User-Agent": [
494494
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -614,7 +614,7 @@
614614
"RequestBody": "",
615615
"RequestHeaders": {
616616
"x-ms-version": [
617-
"2016-03-01"
617+
"2016-07-01"
618618
],
619619
"User-Agent": [
620620
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -655,7 +655,7 @@
655655
"RequestBody": "",
656656
"RequestHeaders": {
657657
"x-ms-version": [
658-
"2016-03-01"
658+
"2016-07-01"
659659
],
660660
"User-Agent": [
661661
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -699,7 +699,7 @@
699699
"RequestBody": "",
700700
"RequestHeaders": {
701701
"x-ms-version": [
702-
"2016-03-01"
702+
"2016-07-01"
703703
],
704704
"User-Agent": [
705705
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -743,7 +743,7 @@
743743
"RequestBody": "",
744744
"RequestHeaders": {
745745
"x-ms-version": [
746-
"2016-03-01"
746+
"2016-07-01"
747747
],
748748
"User-Agent": [
749749
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -828,7 +828,7 @@
828828
"RequestBody": "",
829829
"RequestHeaders": {
830830
"x-ms-version": [
831-
"2016-03-01"
831+
"2016-07-01"
832832
],
833833
"User-Agent": [
834834
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -869,7 +869,7 @@
869869
"RequestBody": "",
870870
"RequestHeaders": {
871871
"x-ms-version": [
872-
"2016-03-01"
872+
"2016-07-01"
873873
],
874874
"User-Agent": [
875875
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -913,7 +913,7 @@
913913
"RequestBody": "",
914914
"RequestHeaders": {
915915
"x-ms-version": [
916-
"2016-03-01"
916+
"2016-07-01"
917917
],
918918
"User-Agent": [
919919
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -957,7 +957,7 @@
957957
"RequestBody": "",
958958
"RequestHeaders": {
959959
"x-ms-version": [
960-
"2016-03-01"
960+
"2016-07-01"
961961
],
962962
"User-Agent": [
963963
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -1001,7 +1001,7 @@
10011001
"RequestBody": "",
10021002
"RequestHeaders": {
10031003
"x-ms-version": [
1004-
"2016-03-01"
1004+
"2016-07-01"
10051005
],
10061006
"User-Agent": [
10071007
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -1045,7 +1045,7 @@
10451045
"RequestBody": "",
10461046
"RequestHeaders": {
10471047
"x-ms-version": [
1048-
"2016-03-01"
1048+
"2016-07-01"
10491049
],
10501050
"User-Agent": [
10511051
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -1130,7 +1130,7 @@
11301130
"RequestBody": "",
11311131
"RequestHeaders": {
11321132
"x-ms-version": [
1133-
"2016-03-01"
1133+
"2016-07-01"
11341134
],
11351135
"User-Agent": [
11361136
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -1174,7 +1174,7 @@
11741174
"RequestBody": "",
11751175
"RequestHeaders": {
11761176
"x-ms-version": [
1177-
"2016-03-01"
1177+
"2016-07-01"
11781178
],
11791179
"User-Agent": [
11801180
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
@@ -1216,4 +1216,4 @@
12161216
"Variables": {
12171217
"SubscriptionId": "24fb23e3-6ba3-41f0-9b6e-e41131d5d61e"
12181218
}
1219-
}
1219+
}

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationAzureReservedIP.json

Lines changed: 962 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationNetworkSecurityGroup.json

Lines changed: 921 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationRouteTable.json

Lines changed: 921 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/Common/Commands.ScenarioTest/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.7-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
22-
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
2322
<package id="Microsoft.WindowsAzure.Management.Compute" version="13.0.0" targetFramework="net45" />
24-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.3" targetFramework="net45" />
23+
<package id="Microsoft.WindowsAzure.Management.Network" version="8.0.0" targetFramework="net45" />
24+
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.WebSites" version="5.0.0-prerelease" targetFramework="net45" />
2626
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2727
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
@@ -33,4 +33,4 @@
3333
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
3434
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
3535
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
36-
</packages>
36+
</packages>

0 commit comments

Comments
 (0)