Skip to content

Add migration cmdlets #2721

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 20 commits into from
Aug 4, 2016
Merged

Add migration cmdlets #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
10cb82c
Minor fixes and enable tests
DeepakRajendranMsft Jul 26, 2016
73ea56f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
DeepakRajendranMsft Jul 30, 2016
ebdf6f6
Add migration cmdlets for resesrvedip, routes and nsg and update ASM …
DeepakRajendranMsft Jul 30, 2016
48413a4
update tests
DeepakRajendranMsft Jul 30, 2016
f0cafdb
fix csprojs
DeepakRajendranMsft Jul 30, 2016
9d6125d
fix tests and add help
DeepakRajendranMsft Jul 30, 2016
9ee01ee
fix comments, tests and add help
DeepakRajendranMsft Jul 30, 2016
e0e48f4
fix more tests
DeepakRajendranMsft Jul 30, 2016
edb6b60
Add tests to migration cmdlets
DeepakRajendranMsft Jul 31, 2016
455e325
merge with upstream dev
DeepakRajendranMsft Aug 1, 2016
cd3900d
omit pass1word from help file
DeepakRajendranMsft Aug 3, 2016
8db5268
Merge branch 'release-2.0.0' of https://github.com/Azure/azure-powers…
DeepakRajendranMsft Aug 3, 2016
475fe55
Add credscanner filter
DeepakRajendranMsft Aug 3, 2016
54724fb
Add credscanner filter
DeepakRajendranMsft Aug 3, 2016
09ef208
Merge branch 'AddMigrationCmdlets' of https://github.com/DeepakRajend…
DeepakRajendranMsft Aug 3, 2016
bced5f3
remove unused ref in packages.config from ServiceManagement/Services/…
DeepakRajendranMsft Aug 3, 2016
d081a6f
Merge branch 'release-2.0.0' of https://github.com/Azure/azure-powers…
DeepakRajendranMsft Aug 3, 2016
e11bd2c
Add shouldprocess for migration network cmdlets
DeepakRajendranMsft Aug 4, 2016
5ea0072
update tests
DeepakRajendranMsft Aug 4, 2016
de2f9dc
fix failing tests
DeepakRajendranMsft Aug 4, 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
17 changes: 13 additions & 4 deletions src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.13.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.8.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
Expand Down Expand Up @@ -334,6 +334,15 @@
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationAbortAzureVNet.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationAzureReservedIP.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationNetworkSecurityGroup.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationRouteTable.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestMigrationValidateAzureDeployment.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -546,7 +555,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\ServiceManagement\ServiceManagementTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\ServiceManagement\Common.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -651,4 +660,4 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<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')" />
</Project>
</Project>
85 changes: 85 additions & 0 deletions ...ement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,91 @@ function Test-MigrationAbortAzureStorageAccount
Remove-AzureStorageAccount -StorageAccountName $storageName;
}

<#
.SYNOPSIS
Tests Move-AzureNetworkSecurityGroup
#>
function Test-MigrationNetworkSecurityGroup
{
# Setup
$securityGroupName = getAssetName
$location = Get-DefaultLocation
New-AzureNetworkSecurityGroup -Name $securityGroupName -location $location

# Validate move
$status = Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Validate
Assert-NotNull $status
Assert-Null $status.ValidationMessages

# Prepare move
Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Prepare

# Abort Move
Move-AzureNetworkSecurityGroup -NetworkSecurityGroupName $securityGroupName -Abort

# Remove
$isDeleted = Remove-AzureNetworkSecurityGroup -Name $securityGroupName -Force -PassThru
}

<#
.SYNOPSIS
Tests Move-AzureRouteTable
#>
function Test-MigrationRouteTable
{
# Setup
$routeTableName = getAssetName
$location = Get-DefaultLocation
New-AzureRouteTable -Name $routeTableName -location $location

# Validate move
$status = Move-AzureRouteTable -RouteTableName $routeTableName -Validate
Assert-NotNull $status
Assert-Null $status.ValidationMessages

# Prepare move
Move-AzureRouteTable -RouteTableName $routeTableName -Prepare

# Abort Move
Move-AzureRouteTable -RouteTableName $routeTableName -Abort

# Remove
$isDeleted = Remove-AzureRouteTable -Name $routeTableName -Force -PassThru
}

<#
.SYNOPSIS
Tests Move-AzureReservedIP
#>
function Test-MigrationAzureReservedIP
{
# Setup
$name = getAssetName
$location = Get-DefaultLocation

# Test Create Reserved IP
New-AzureReservedIP -ReservedIPName $name -Location $location
$reservedIP = Get-AzureReservedIP -ReservedIPName $name

# Assert
Assert-NotNull($reservedIP)
Assert-AreEqual $reservedIP.Location $location

# Validate move
$status = Move-AzureReservedIP -ReservedIPName $name -Validate
Assert-NotNull $status
Assert-Null $status.ValidationMessages

# Prepare move
Move-AzureReservedIP -ReservedIPName $name -Prepare

# Abort Move
Move-AzureReservedIP -ReservedIPName $name -Abort

#Test Remove reserved IP
$removeReservedIP = Remove-AzureReservedIP -ReservedIPName $name -Force
Assert-AreEqual $removeReservedIP.OperationStatus "Succeeded"
}

function Test-NewAzureVMWithBYOL
{
Expand Down
27 changes: 27 additions & 0 deletions src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,33 @@ public void TestMigrateAzureVNet()
this.RunPowerShellTest("Test-MigrateAzureVNet");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestMigrationNetworkSecurityGroup()
{
this.RunPowerShellTest("Test-MigrationNetworkSecurityGroup");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestMigrationAzureReservedIP()
{
this.RunPowerShellTest("Test-MigrationAzureReservedIP");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestMigrationRouteTable()
{
this.RunPowerShellTest("Test-MigrationRouteTable");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
Expand Down
4 changes: 2 additions & 2 deletions ...WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrateAzureDeployment.json
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions ...osoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrateAzureVNet.json
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions ...indowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationAbortAzureVNet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"3165"
],
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -142,7 +142,7 @@
"217"
],
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -183,7 +183,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -227,7 +227,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -271,7 +271,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -315,7 +315,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -359,7 +359,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -403,7 +403,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -488,7 +488,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -614,7 +614,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -655,7 +655,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -699,7 +699,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -743,7 +743,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -828,7 +828,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -869,7 +869,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -913,7 +913,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -957,7 +957,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -1001,7 +1001,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -1045,7 +1045,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -1130,7 +1130,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -1174,7 +1174,7 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-version": [
"2016-03-01"
"2016-07-01"
],
"User-Agent": [
"Microsoft.WindowsAzure.Management.Network.NetworkManagementClient/7.0.0.0"
Expand Down Expand Up @@ -1216,4 +1216,4 @@
"Variables": {
"SubscriptionId": "24fb23e3-6ba3-41f0-9b6e-e41131d5d61e"
}
}
}
962 changes: 962 additions & 0 deletions ...ndowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationAzureReservedIP.json
View file
Open in desktop

Large diffs are not rendered by default.

921 changes: 921 additions & 0 deletions ...Azure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationNetworkSecurityGroup.json
View file
Open in desktop

Large diffs are not rendered by default.

921 changes: 921 additions & 0 deletions ...ft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/TestMigrationRouteTable.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/ServiceManagement/Common/Commands.ScenarioTest/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.7-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Compute" version="13.0.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.3" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Network" version="8.0.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="5.0.0-prerelease" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
Expand All @@ -33,4 +33,4 @@
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
</packages>
</packages>
Loading