Skip to content

Commit 1ac6db6

Browse files
azure-powershell-botVeryEarly
azure-powershell-bot
and
VeryEarly
authored
Migrate Migrate from generation to main (#26925)
* Move Migrate to main * Update ChangeLog.md --------- Co-authored-by: Yabo Hu <[email protected]>
1 parent 3513c12 commit 1ac6db6

13 files changed

+79
-25
lines changed

‎src/Migrate/Migrate.Autorest/custom/New-AzMigrateDiskMapping.ps1

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ function New-AzMigrateDiskMapping {
4040
${IsOSDisk},
4141

4242
[Parameter(Mandatory)]
43-
[ValidateSet("Standard_LRS", "Premium_LRS", "StandardSSD_LRS")]
44-
[ArgumentCompleter( { "Standard_LRS", "Premium_LRS", "StandardSSD_LRS" })]
43+
[ValidateSet("Standard_LRS", "Premium_LRS", "StandardSSD_LRS", "PremiumV2_LRS")]
44+
[ArgumentCompleter( { "Standard_LRS", "Premium_LRS", "StandardSSD_LRS", "PremiumV2_LRS"})]
4545
[Microsoft.Azure.PowerShell.Cmdlets.Migrate.Category('Path')]
4646
[System.String]
4747
# Specifies the type of disks to be used for the Azure VM.
@@ -61,7 +61,8 @@ function New-AzMigrateDiskMapping {
6161
$validDiskTypeSpellings = @{
6262
Standard_LRS = "Standard_LRS";
6363
Premium_LRS = "Premium_LRS";
64-
StandardSSD_LRS = "StandardSSD_LRS"
64+
StandardSSD_LRS = "StandardSSD_LRS";
65+
PremiumV2_LRS = "PremiumV2_LRS";
6566
}
6667
$DiskObject.DiskType = $validDiskTypeSpellings[$DiskType]
6768

@@ -73,6 +74,11 @@ function New-AzMigrateDiskMapping {
7374
if ($PSBoundParameters.ContainsKey('DiskEncryptionSetID')) {
7475
$DiskObject.DiskEncryptionSetId = $DiskEncryptionSetID
7576
}
77+
78+
if ($DiskObject.IsOSDisk -eq "true" -and $DiskObject.DiskType -eq $validDiskTypeSpellings["PremiumV2_LRS"]) {
79+
throw "Premium SSD V2 disk is not supported as an OS Disk in Azure."
80+
}
81+
7682
return $DiskObject
7783
}
7884

‎src/Migrate/Migrate.Autorest/custom/New-AzMigrateServerReplication.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,12 +712,17 @@ public static int hashForArtifact(String artifact)
712712
}
713713

714714

715-
# Check for duplicate disk UUID in user input/discovered VM.
715+
# Check for duplicate disk UUID in user input/discovered VM and Premium V2 disk validations.
716716
foreach ($disk in $ProviderSpecificDetails.DisksToInclude)
717717
{
718718
if ($uniqueDiskUuids.Contains($disk.DiskId)) {
719719
throw "The disk uuid '$($disk.DiskId)' is already taken."
720720
}
721+
722+
if (-not $HasTargetAVZone -and $disk.DiskType -eq "PremiumV2_LRS") {
723+
throw "Premium SSD V2 disk can only be attached to zonal VMs."
724+
}
725+
721726
$res = $uniqueDiskUuids.Add($disk.DiskId)
722727
}
723728

‎src/Migrate/Migrate.Autorest/examples/New-AzMigrateDiskMapping.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
### Example 1: Make disks
1+
### Example 1: Make Standard disks
22
```powershell
3-
New-AzMigrateDiskMapping -DiskID a -DiskType Standard -IsOSDisk 'true'
3+
New-AzMigrateDiskMapping -DiskID a -DiskType Standard_LRS -IsOSDisk 'true'
44
```
55

66
```output
7-
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
8-
------------------- ------ -------- -------- ------------------- ------------------------------
9-
a Standard true
7+
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
8+
------------------- ------ -------- -------- ------------------- ------------------------------
9+
a Standard_LRS true
1010
```
1111

12-
Get disks object to provide input for New-AzMigrateServerReplication
12+
### Example 2: Make Premium V2 disks
13+
```powershell
14+
New-AzMigrateDiskMapping -DiskID b -DiskType PremiumV2_LRS -IsOSDisk 'false'
15+
```
1316

17+
```output
18+
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
19+
------------------- ------ -------- -------- ------------------- ------------------------------
20+
b PremiumV2_LRS false
21+
```
1422

23+
Get disks object to provide input for New-AzMigrateServerReplication

‎src/Migrate/Migrate.Autorest/examples/New-AzMigrateServerReplication.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ This is for the scenario, when there is only one single disk that has to be prot
3232
```powershell
3333
$OSDisk = New-AzMigrateDiskMapping -DiskID '6000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'true'
3434
$DataDisk = New-AzMigrateDiskMapping -DiskID '7000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'false'
35+
$DisksToInclude = @()
3536
$DisksToInclude += $OSDisk
3637
$DisksToInclude += $DataDisk
3738
New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.OffAzure/VMwareSites/AzMigratePWSHTc8d1site/machines/bcdr-vcenter-fareast-corp-micro-cfcc5a24-a40e-56b9-a6af-e206c9ca4f93_50063baa-9806-d6d6-7e09-c0ae87309b4f" -LicenseType NoLicenseType -TargetResourceGroupId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG" -TargetNetworkId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG/providers/Microsoft.Network/virtualNetworks/AzMigrateTargetNetwork" -TargetSubnetName default -TargetVMName "prsadhu-TestVM" -DiskToInclude $DisksToInclude -PerformAutoResync true

‎src/Migrate/Migrate.Autorest/exports/New-AzMigrateDiskMapping.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ Creates a new disk mapping
2020
.Description
2121
The New-AzMigrateDiskMapping cmdlet creates a mapping of the source disk attached to the server to be migrated
2222
.Example
23-
New-AzMigrateDiskMapping -DiskID a -DiskType Standard -IsOSDisk 'true'
23+
New-AzMigrateDiskMapping -DiskID a -DiskType Standard_LRS -IsOSDisk 'true'
24+
.Example
25+
New-AzMigrateDiskMapping -DiskID b -DiskType PremiumV2_LRS -IsOSDisk 'false'
2426
2527
.Outputs
2628
Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api202401.IVMwareCbtDiskInput
@@ -45,7 +47,7 @@ param(
4547
${IsOSDisk},
4648

4749
[Parameter(Mandatory)]
48-
[ArgumentCompleter({ "Standard_LRS", "Premium_LRS", "StandardSSD_LRS" })]
50+
[ArgumentCompleter({ "Standard_LRS", "Premium_LRS", "StandardSSD_LRS", "PremiumV2_LRS"})]
4951
[Microsoft.Azure.PowerShell.Cmdlets.Migrate.Category('Path')]
5052
[System.String]
5153
# Specifies the type of disks to be used for the Azure VM.

‎src/Migrate/Migrate.Autorest/exports/New-AzMigrateServerReplication.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx4/resourceG
2424
.Example
2525
$OSDisk = New-AzMigrateDiskMapping -DiskID '6000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'true'
2626
$DataDisk = New-AzMigrateDiskMapping -DiskID '7000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'false'
27+
$DisksToInclude = @()
2728
$DisksToInclude += $OSDisk
2829
$DisksToInclude += $DataDisk
2930
New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.OffAzure/VMwareSites/AzMigratePWSHTc8d1site/machines/bcdr-vcenter-fareast-corp-micro-cfcc5a24-a40e-56b9-a6af-e206c9ca4f93_50063baa-9806-d6d6-7e09-c0ae87309b4f" -LicenseType NoLicenseType -TargetResourceGroupId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG" -TargetNetworkId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG/providers/Microsoft.Network/virtualNetworks/AzMigrateTargetNetwork" -TargetSubnetName default -TargetVMName "prsadhu-TestVM" -DiskToInclude $DisksToInclude -PerformAutoResync true

‎src/Migrate/Migrate.Autorest/exports/ProxyCmdletDefinitions.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4365,7 +4365,9 @@ Creates a new disk mapping
43654365
.Description
43664366
The New-AzMigrateDiskMapping cmdlet creates a mapping of the source disk attached to the server to be migrated
43674367
.Example
4368-
New-AzMigrateDiskMapping -DiskID a -DiskType Standard -IsOSDisk 'true'
4368+
New-AzMigrateDiskMapping -DiskID a -DiskType Standard_LRS -IsOSDisk 'true'
4369+
.Example
4370+
New-AzMigrateDiskMapping -DiskID b -DiskType PremiumV2_LRS -IsOSDisk 'false'
43694371
43704372
.Outputs
43714373
Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api202401.IVMwareCbtDiskInput
@@ -4390,7 +4392,7 @@ param(
43904392
${IsOSDisk},
43914393

43924394
[Parameter(Mandatory)]
4393-
[ArgumentCompleter({ "Standard_LRS", "Premium_LRS", "StandardSSD_LRS" })]
4395+
[ArgumentCompleter({ "Standard_LRS", "Premium_LRS", "StandardSSD_LRS", "PremiumV2_LRS"})]
43944396
[Microsoft.Azure.PowerShell.Cmdlets.Migrate.Category('Path')]
43954397
[System.String]
43964398
# Specifies the type of disks to be used for the Azure VM.
@@ -5275,6 +5277,7 @@ New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx4/resourceG
52755277
.Example
52765278
$OSDisk = New-AzMigrateDiskMapping -DiskID '6000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'true'
52775279
$DataDisk = New-AzMigrateDiskMapping -DiskID '7000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'false'
5280+
$DisksToInclude = @()
52785281
$DisksToInclude += $OSDisk
52795282
$DisksToInclude += $DataDisk
52805283
New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.OffAzure/VMwareSites/AzMigratePWSHTc8d1site/machines/bcdr-vcenter-fareast-corp-micro-cfcc5a24-a40e-56b9-a6af-e206c9ca4f93_50063baa-9806-d6d6-7e09-c0ae87309b4f" -LicenseType NoLicenseType -TargetResourceGroupId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG" -TargetNetworkId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG/providers/Microsoft.Network/virtualNetworks/AzMigrateTargetNetwork" -TargetSubnetName default -TargetVMName "prsadhu-TestVM" -DiskToInclude $DisksToInclude -PerformAutoResync true

‎src/Migrate/Migrate.Autorest/help/New-AzMigrateDiskMapping.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,28 @@ The New-AzMigrateDiskMapping cmdlet creates a mapping of the source disk attache
2222

2323
## EXAMPLES
2424

25-
### Example 1: Make disks
25+
### Example 1: Make Standard disks
2626
```powershell
27-
New-AzMigrateDiskMapping -DiskID a -DiskType Standard -IsOSDisk 'true'
27+
New-AzMigrateDiskMapping -DiskID a -DiskType Standard_LRS -IsOSDisk 'true'
2828
```
2929

3030
```output
31-
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
32-
------------------- ------ -------- -------- ------------------- ------------------------------
33-
a Standard true
31+
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
32+
------------------- ------ -------- -------- ------------------- ------------------------------
33+
a Standard_LRS true
34+
```
35+
36+
37+
38+
### Example 2: Make Premium V2 disks
39+
```powershell
40+
New-AzMigrateDiskMapping -DiskID b -DiskType PremiumV2_LRS -IsOSDisk 'false'
41+
```
42+
43+
```output
44+
DiskEncryptionSetId DiskId DiskType IsOSDisk LogStorageAccountId LogStorageAccountSasSecretName
45+
------------------- ------ -------- -------- ------------------- ------------------------------
46+
b PremiumV2_LRS false
3447
```
3548

3649
Get disks object to provide input for New-AzMigrateServerReplication

‎src/Migrate/Migrate.Autorest/help/New-AzMigrateServerReplication.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ This is for the scenario, when there is only one single disk that has to be prot
104104
```powershell
105105
$OSDisk = New-AzMigrateDiskMapping -DiskID '6000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'true'
106106
$DataDisk = New-AzMigrateDiskMapping -DiskID '7000C299-343d-7bcd-c05e-a94bd63316dd' -DiskType 'Standard_LRS' -IsOSDisk 'false'
107+
$DisksToInclude = @()
107108
$DisksToInclude += $OSDisk
108109
$DisksToInclude += $DataDisk
109110
New-AzMigrateServerReplication -MachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.OffAzure/VMwareSites/AzMigratePWSHTc8d1site/machines/bcdr-vcenter-fareast-corp-micro-cfcc5a24-a40e-56b9-a6af-e206c9ca4f93_50063baa-9806-d6d6-7e09-c0ae87309b4f" -LicenseType NoLicenseType -TargetResourceGroupId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG" -TargetNetworkId "/subscriptions/xxx-xxx-xxx/resourceGroups/AzMigratePWSHtargetRG/providers/Microsoft.Network/virtualNetworks/AzMigrateTargetNetwork" -TargetSubnetName default -TargetVMName "prsadhu-TestVM" -DiskToInclude $DisksToInclude -PerformAutoResync true

‎src/Migrate/Migrate/Az.Migrate.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 12/17/2024
6+
# Generated on: 12/24/2024
77
#
88

99
@{

0 commit comments

Comments
 (0)