Merge pull request #9028 from MabOneSdk/sqlRestoreFix

[RecoveryServices] Made some attributes read only for get restore config cmdlet

Author: markcowl

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmWorkloadModels/AzureWorkloadRecoveryConfig.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
@@ -25,12 +26,12 @@ public class AzureWorkloadRecoveryConfig : RecoveryConfigBase
         /// <summary>
         /// Target Server
         /// </summary>
-        public string TargetServer { get; set; }
+        public string TargetServer { get; }
 
         /// <summary>
         /// Target Instance
         /// </summary>
-        public string TargetInstance { get; set; }
+        public string TargetInstance { get; }
 
         /// <summary>
         /// Restored DB Name
@@ -54,8 +55,12 @@ public class AzureWorkloadRecoveryConfig : RecoveryConfigBase
 
         public string ContainerId { get; set; }
 
-        public AzureWorkloadRecoveryConfig()
+        public AzureWorkloadRecoveryConfig(string targetServer, string targetInstance, string restoreRequestType,
+            RecoveryPointBase recoveryPoint, DateTime pointInTime)
+            : base(restoreRequestType, recoveryPoint, pointInTime)
         {
+            TargetServer = targetServer;
+            TargetInstance = targetInstance;
         }
     }
 }

src/RecoveryServices/RecoveryServices.Backup.Models/BaseObjects.cs

@@ -492,16 +492,23 @@ public class RecoveryConfigBase
         /// <summary>
         /// Original WL Restore, Alternate WL restore, Alternate WL restore to diff item.
         /// </summary>
-        public string RestoreRequestType { get; set; }
+        public string RestoreRequestType { get; }
 
         /// <summary>
         /// Recovery point for full/differential backup.
         /// </summary>
-        public RecoveryPointBase RecoveryPoint { get; set; }
+        public RecoveryPointBase RecoveryPoint { get; }
 
         /// <summary>
         /// PointInTime for Log backup.
         /// </summary>
-        public DateTime PointInTime { get; set; }
+        public DateTime PointInTime { get; }
+
+        public RecoveryConfigBase(string restoreRequestType, RecoveryPointBase recoveryPoint, DateTime pointInTime)
+        {
+            RestoreRequestType = restoreRequestType;
+            RecoveryPoint = recoveryPoint;
+            PointInTime = pointInTime;
+        }
     }
 }

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs

@@ -391,7 +391,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                     {
                         OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
                         OverwriteOptions.FailOnConflict : OverwriteOptions.Overwrite,
-                        DatabaseName = wLRecoveryConfig.RestoredDBName,
+                        DatabaseName = wLRecoveryConfig.TargetInstance + "/" + wLRecoveryConfig.RestoredDBName,
                         ContainerId = wLRecoveryConfig.ContainerId
                     };
                     azureWorkloadSQLRestoreRequest.AlternateDirectoryPaths = wLRecoveryConfig.targetPhysicalPath;
@@ -417,7 +417,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                     {
                         OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
                         OverwriteOptions.FailOnConflict : OverwriteOptions.Overwrite,
-                        DatabaseName = wLRecoveryConfig.RestoredDBName,
+                        DatabaseName = wLRecoveryConfig.TargetInstance + "/" + wLRecoveryConfig.RestoredDBName,
                         ContainerId = wLRecoveryConfig.ContainerId
                     };
                     azureWorkloadSQLPointInTimeRestoreRequest.AlternateDirectoryPaths = wLRecoveryConfig.targetPhysicalPath;