Skip to content

[Az.Migrate] Tagging bug fix #15573

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 3 commits into from
Jul 29, 2021
Merged

[Az.Migrate] Tagging bug fix #15573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6ac940
Move Migrate to release-2021-08-03
Jul 28, 2021
97e1be4
Update GeneratedModuleList.txt
isra-fel Jul 28, 2021
991b002
Merge branch 'release-2021-08-03' into codegen/Migrate
isra-fel Jul 29, 2021
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 changes: 1 addition & 1 deletion src/Migrate/Az.Migrate.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/26/2021
# Generated on: 7/28/2021
#

@{
Expand Down
130 changes: 65 additions & 65 deletions src/Migrate/Migrate.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.6.30114.105
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{2859F804-F238-4F9F-97C8-211A20AB87A6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{4F45282F-1038-4543-936C-6A4F26D923BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{F9DC971B-3FC6-49EE-8C2B-C10152758A08}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{5865F747-0236-41E2-971F-83D9DA0DCA10}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{0EE7328C-4C77-4AD0-8666-F14C667F68B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{C2496D13-00AC-4D9E-9A88-B481F29EEA05}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{07798F1D-C572-47B1-A330-197B0E17D80E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Az.Migrate.csproj", "{64CB87A5-B3FC-48EE-923A-A63E325700AC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Az.Migrate.csproj", "{BF7AB725-7968-445E-9358-C62AD37F3665}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -26,65 +26,65 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x64.ActiveCfg = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x64.Build.0 = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x86.ActiveCfg = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Debug|x86.Build.0 = Debug|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|Any CPU.Build.0 = Release|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x64.ActiveCfg = Release|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x64.Build.0 = Release|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x86.ActiveCfg = Release|Any CPU
{2859F804-F238-4F9F-97C8-211A20AB87A6}.Release|x86.Build.0 = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x64.ActiveCfg = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x64.Build.0 = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Debug|x86.Build.0 = Debug|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|Any CPU.Build.0 = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x64.ActiveCfg = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x64.Build.0 = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x86.ActiveCfg = Release|Any CPU
{F9DC971B-3FC6-49EE-8C2B-C10152758A08}.Release|x86.Build.0 = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x64.ActiveCfg = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x64.Build.0 = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x86.ActiveCfg = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Debug|x86.Build.0 = Debug|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|Any CPU.Build.0 = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x64.ActiveCfg = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x64.Build.0 = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x86.ActiveCfg = Release|Any CPU
{1BD51096-7A55-4B56-B4FF-8507AEE12DE6}.Release|x86.Build.0 = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x64.ActiveCfg = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x64.Build.0 = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x86.ActiveCfg = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Debug|x86.Build.0 = Debug|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|Any CPU.Build.0 = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x64.ActiveCfg = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x64.Build.0 = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x86.ActiveCfg = Release|Any CPU
{C2496D13-00AC-4D9E-9A88-B481F29EEA05}.Release|x86.Build.0 = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x64.ActiveCfg = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x64.Build.0 = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x86.ActiveCfg = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Debug|x86.Build.0 = Debug|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|Any CPU.Build.0 = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x64.ActiveCfg = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x64.Build.0 = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x86.ActiveCfg = Release|Any CPU
{64CB87A5-B3FC-48EE-923A-A63E325700AC}.Release|x86.Build.0 = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x64.ActiveCfg = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x64.Build.0 = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x86.ActiveCfg = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Debug|x86.Build.0 = Debug|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|Any CPU.Build.0 = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x64.ActiveCfg = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x64.Build.0 = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x86.ActiveCfg = Release|Any CPU
{4F45282F-1038-4543-936C-6A4F26D923BD}.Release|x86.Build.0 = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x64.ActiveCfg = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x64.Build.0 = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x86.ActiveCfg = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Debug|x86.Build.0 = Debug|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|Any CPU.Build.0 = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x64.ActiveCfg = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x64.Build.0 = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x86.ActiveCfg = Release|Any CPU
{5865F747-0236-41E2-971F-83D9DA0DCA10}.Release|x86.Build.0 = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x64.ActiveCfg = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x64.Build.0 = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x86.ActiveCfg = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Debug|x86.Build.0 = Debug|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|Any CPU.Build.0 = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x64.ActiveCfg = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x64.Build.0 = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x86.ActiveCfg = Release|Any CPU
{0EE7328C-4C77-4AD0-8666-F14C667F68B5}.Release|x86.Build.0 = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x64.ActiveCfg = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x64.Build.0 = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x86.ActiveCfg = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Debug|x86.Build.0 = Debug|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|Any CPU.Build.0 = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x64.ActiveCfg = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x64.Build.0 = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x86.ActiveCfg = Release|Any CPU
{07798F1D-C572-47B1-A330-197B0E17D80E}.Release|x86.Build.0 = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x64.ActiveCfg = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x64.Build.0 = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x86.ActiveCfg = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Debug|x86.Build.0 = Debug|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|Any CPU.Build.0 = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x64.ActiveCfg = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x64.Build.0 = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x86.ActiveCfg = Release|Any CPU
{BF7AB725-7968-445E-9358-C62AD37F3665}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
5 changes: 3 additions & 2 deletions src/Migrate/custom/Set-AzMigrateServerReplication.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function Set-AzMigrateServerReplication {
$UserProvidedTag += @{$operation = $UpdateNicTag}
}
else {
$ProviderSpecificDetails.TargetVmTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetVmTag
$ProviderSpecificDetails.TargetNicTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetNicTag
}

if ($HasUpdateDiskTag -And $HasUpdateDiskTagOperation -And $UpdateDiskTag)
Expand All @@ -347,7 +347,7 @@ function Set-AzMigrateServerReplication {
$UserProvidedTag += @{$operation = $UpdateDiskTag}
}
else {
$ProviderSpecificDetails.TargetVmTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetVmTag
$ProviderSpecificDetails.TargetDiskTag = $ReplicationMigrationItem.ProviderSpecificDetail.TargetDiskTag
}

foreach($tag in $UserProvidedTag.Keys)
Expand Down Expand Up @@ -623,6 +623,7 @@ function Set-AzMigrateServerReplication {
$updateNic.NicId = $storedNic.NicId
$updateNic.TargetStaticIPAddress = $storedNic.TargetIPAddress
$updateNic.TargetSubnetName = $storedNic.TargetSubnetName
$updateNic.TargetNicName = $storedNic.TargetNicName

$matchingUserInputNic = $null
if ($HasNicToUpdate) {
Expand Down
10 changes: 5 additions & 5 deletions src/Migrate/generate-info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"autorest_modelerfour": "4.15.414",
"node": "v14.15.5",
"swagger_commit": "e3dbb827d99eaadf132075707373f6b4bda08fd9",
"autorest": "`-- (empty)",
"autorest_powershell": "3.0.438",
"autorest_core": "3.5.1"
"node": "v14.15.5",
"autorest_core": "3.5.1",
"swagger_commit": "2b4fc08199d3789162b806c70eb25f09a40fc55c",
"autorest_modelerfour": "4.15.414",
"autorest": "`-- (empty)"
}
1 change: 0 additions & 1 deletion tools/GeneratedModuleList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Az.MonitoringSolutions
Az.MySql
Az.Portal
Az.PostgreSql
Az.PostgreSQL
Az.ProviderHub
Az.RedisEnterpriseCache
Az.ResourceMover
Expand Down