Enhance Az.Migrate to prep for service release (#28020)

Co-authored-by: Sam Lee <[email protected]>

Author: minhsuanlee

src/Migrate/Migrate.Autorest/Properties/AssemblyInfo.cs

@@ -20,10 +20,7 @@
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
 [assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Migrate")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("2.7.0")]
-[assembly: System.Reflection.AssemblyVersionAttribute("2.7.0")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("2.8.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("2.8.0")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly: System.CLSCompliantAttribute(false)]
-
-
-

src/Migrate/Migrate.Autorest/README.md

@@ -54,7 +54,7 @@ input-file:
   - $(repo)/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2024-01-01/service.json
   - $(repo)/specification/recoveryservicesdatareplication/resource-manager/Microsoft.DataReplication/stable/2024-09-01/recoveryservicesdatareplication.json
 
-module-version: 3.0.10
+module-version: 3.0.12
 title: Migrate 
 subject-prefix: 'Migrate'
 
@@ -123,6 +123,9 @@ directive:
     - JobModelCustomProperties
     - TaskModel
     - TaskModelCustomProperties
+    - FabricAgentModelProperties
+    - FabricAgentModelCustomProperties
+    - VaultModelProperties
   # Remove variants not in scope
   - from: Microsoft.RecoveryServices/stable/2024-01-01/service.json
     where:

src/Migrate/Migrate.Autorest/custom/AzLocalDiskInput.cs

@@ -12,8 +12,7 @@ public AzLocalDiskInput(
             long diskSizeGB, 
             string diskFileFormat, 
             bool isOsDisk,
-            long? diskPhysicalSectorSize,
-            string storageContainerId)
+            long? diskPhysicalSectorSize)
         {
             DiskId = diskId;
             IsDynamic = isDynamic;
@@ -25,11 +24,6 @@ public AzLocalDiskInput(
                 (diskPhysicalSectorSize == 512 || diskPhysicalSectorSize == 4096) 
                 ? diskPhysicalSectorSize 
                 : null;
-
-            StorageContainerId = 
-                string.IsNullOrWhiteSpace(storageContainerId)
-                ? null
-                : storageContainerId;
         }
 
         /// <summary>Gets or sets the type of the virtual hard disk, vhd or vhdx.</summary>
@@ -52,8 +46,5 @@ public AzLocalDiskInput(
 
         /// <summary>Gets or sets a value indicating whether disk is os disk.</summary>
         public bool IsOSDisk { get; set; }
-
-        /// <summary>Gets or sets the target storage account ARM Id.</summary>
-        public string StorageContainerId { get; set; }
     }
 }

src/Migrate/Migrate.Autorest/custom/Get-AzMigrateLocalJob.ps1

@@ -22,7 +22,7 @@ The Get-AzMigrateLocalJob cmdlet retrieves the status of an Azure Migrate job.
 https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratelocaljob
 #>
 function Get-AzMigrateLocalJob {
-    [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Runtime.PreviewMessageAttribute("This cmdlet is using a preview API version and is subject to breaking change in a future release.")]
+    [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Runtime.PreviewMessageAttribute("This cmdlet is based on a preview API version and may experience breaking changes in future releases.")]
     [OutputType([Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api20240901.IJobModel])]
     [CmdletBinding(DefaultParameterSetName = 'ListByName', PositionalBinding = $false)]
     param(

src/Migrate/Migrate.Autorest/custom/Get-AzMigrateLocalServerReplication.ps1

@@ -22,7 +22,7 @@ The Get-AzMigrateLocalServerReplication cmdlet retrieves the object for the repl
 https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratelocalserverreplication
 #>
 function Get-AzMigrateLocalServerReplication {
-    [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Runtime.PreviewMessageAttribute("This cmdlet is using a preview API version and is subject to breaking change in a future release.")]
+    [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Runtime.PreviewMessageAttribute("This cmdlet is based on a preview API version and may experience breaking changes in future releases.")]
     [OutputType([Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api20240901.IProtectedItemModel])]
     [CmdletBinding(DefaultParameterSetName = 'ListByName', PositionalBinding = $false)]
     param(

src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1

@@ -5,8 +5,8 @@ $AzLocalInstanceTypes = @{
 
 # Fabric instances
 $FabricInstanceTypes = @{
-    HyperVInstance     = "HyperVMigrate";
-    VMwareInstance     = "VMwareMigrate";
+    HyperVInstance = "HyperVMigrate";
+    VMwareInstance = "VMwareMigrate";
     AzLocalInstance = "AzStackHCI";
 }
 
@@ -101,6 +101,12 @@ $VMwareToolsStatus = @{
     NotInstalled = "NotInstalled";
 }
 
+$OsType = @{
+    LinuxGuest = "linuxguest";
+    WindowsGuest = "windowsguest";
+    OtherGuestFamily = "otherguestfamily";
+}
+
 $VmReplicationValidationMessage = "Replication could not be initiated. Please ensure the necessary changes are made, and allow up to 30 minutes before re-trying."
 $VmReplicationValidationMessages = @{
     VmPoweredOff            = "The VM is currently powered off. $VmReplicationValidationMessage";

src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1

@@ -277,12 +277,14 @@ function ValidateReplication {
         throw $VmReplicationValidationMessages.AlreadyInReplication
     }
 
+    # Check the VM power status
     if ($Machine.PowerStatus -eq $PowerStatus.OffVMware -or $Machine.PowerStatus -eq $PowerStatus.OffHyperV) {
         throw $VmReplicationValidationMessages.VmPoweredOff
     }
 
     if ($MigrationType -eq $AzLocalInstanceTypes.HyperVToAzLocal) {
-        if (-not $Machine.OperatingSystemDetailOSType -or $Machine.OperatingSystemDetailOSType -eq "") {
+        if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType) -or
+            ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname))) {
             throw $VmReplicationValidationMessages.OsTypeNotFound
         }
 
@@ -292,6 +294,7 @@ function ValidateReplication {
     }
 
     if ($MigrationType -eq $AzLocalInstanceTypes.VMwareToAzLocal) {
+        # Once VMware tools are installed, OS type should be available.
         if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
             throw $VmReplicationValidationMessages.VmWareToolsNotRunning
         }