Added recoverymode parameter

Sambit Rath · Sambit Rath · commit d707b9a69798 · 2020-02-03T18:21:48.000+05:30
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/BaseObjects.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/BaseObjects.cs
@@ -492,7 +492,7 @@ public class RecoveryConfigBase
         /// <summary>
         /// Original WL Restore, Alternate WL restore, Alternate WL restore to diff item.
         /// </summary>
-        public string RestoreRequestType { get; }
+        public string RestoreRequestType { get; set; }
 
         /// <summary>
         /// Recovery point for full/differential backup.
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs
@@ -390,7 +390,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 azureWorkloadSQLRestoreRequest.RecoveryType =
                     string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?
                     RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;
-                if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")
+                if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)
                 {
                     azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
@@ -403,6 +403,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 }
                 if (wLRecoveryConfig.RecoveryMode == "FileRecovery")
                 {
+                    azureWorkloadSQLRestoreRequest.RecoveryMode = "FileRecovery";
                     azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
                         OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
@@ -426,7 +427,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType =
                     string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?
                     RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;
-                if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")
+                if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)
                 {
                     azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
@@ -440,6 +441,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
 
                 if (wLRecoveryConfig.RecoveryMode == "FileRecovery")
                 {
+                    azureWorkloadSQLPointInTimeRestoreRequest.RecoveryMode = "FileRecovery";
                     azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
                         OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
diff --git a/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Restore/GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig.cs b/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Restore/GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig.cs
@@ -116,7 +116,7 @@ public override void ExecuteCmdlet()
                 string vaultName = resourceIdentifier.ResourceName;
                 string resourceGroupName = resourceIdentifier.ResourceGroupName;
 
-                if (!OriginalWorkloadRestore.IsPresent && !AlternateWorkloadRestore.IsPresent)
+                if (!OriginalWorkloadRestore.IsPresent && !AlternateWorkloadRestore.IsPresent && !RestoreAsFiles.IsPresent)
                 {
                     throw new ArgumentException(string.Format(Resources.AzureWorkloadRestoreLocationException));
                 }
@@ -261,6 +261,7 @@ public override void ExecuteCmdlet()
                     azureWorkloadRecoveryConfig.OverwriteWLIfpresent = "No";
                     azureWorkloadRecoveryConfig.NoRecoveryMode = "Disabled";
                     azureWorkloadRecoveryConfig.ContainerId = (TargetContainer as AzureVmWorkloadContainer).Id;
+                    azureWorkloadRecoveryConfig.RestoreRequestType = "Alternate WL Restore";
                     azureWorkloadRecoveryConfig.RecoveryMode = "FileRecovery";
                     azureWorkloadRecoveryConfig.FilePath = FilePath;
                 }

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()`
`390`	`390`	`azureWorkloadSQLRestoreRequest.RecoveryType =`
`391`	`391`	`string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?`
`392`	`392`	`RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;`
`393`		`- if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")`
	`393`	`+ if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)`
`394`	`394`	`{`
`395`	`395`	`azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()`
`396`	`396`	`{`
`@@ -403,6 +403,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()`
`403`	`403`	`}`
`404`	`404`	`if (wLRecoveryConfig.RecoveryMode == "FileRecovery")`
`405`	`405`	`{`
	`406`	`+ azureWorkloadSQLRestoreRequest.RecoveryMode = "FileRecovery";`
`406`	`407`	`azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()`
`407`	`408`	`{`
`408`	`409`	`OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?`
`@@ -426,7 +427,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()`
`426`	`427`	`azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType =`
`427`	`428`	`string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?`
`428`	`429`	`RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;`
`429`		`- if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")`
	`430`	`+ if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)`
`430`	`431`	`{`
`431`	`432`	`azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()`
`432`	`433`	`{`
`@@ -440,6 +441,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()`
`440`	`441`
`441`	`442`	`if (wLRecoveryConfig.RecoveryMode == "FileRecovery")`
`442`	`443`	`{`
	`444`	`+ azureWorkloadSQLPointInTimeRestoreRequest.RecoveryMode = "FileRecovery";`
`443`	`445`	`azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()`
`444`	`446`	`{`
`445`	`447`	`OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public override void ExecuteCmdlet()`
`116`	`116`	`string vaultName = resourceIdentifier.ResourceName;`
`117`	`117`	`string resourceGroupName = resourceIdentifier.ResourceGroupName;`
`118`	`118`
`119`		`- if (!OriginalWorkloadRestore.IsPresent && !AlternateWorkloadRestore.IsPresent)`
	`119`	`+ if (!OriginalWorkloadRestore.IsPresent && !AlternateWorkloadRestore.IsPresent && !RestoreAsFiles.IsPresent)`
`120`	`120`	`{`
`121`	`121`	`throw new ArgumentException(string.Format(Resources.AzureWorkloadRestoreLocationException));`
`122`	`122`	`}`
`@@ -261,6 +261,7 @@ public override void ExecuteCmdlet()`
`261`	`261`	`azureWorkloadRecoveryConfig.OverwriteWLIfpresent = "No";`
`262`	`262`	`azureWorkloadRecoveryConfig.NoRecoveryMode = "Disabled";`
`263`	`263`	`azureWorkloadRecoveryConfig.ContainerId = (TargetContainer as AzureVmWorkloadContainer).Id;`
	`264`	`+ azureWorkloadRecoveryConfig.RestoreRequestType = "Alternate WL Restore";`
`264`	`265`	`azureWorkloadRecoveryConfig.RecoveryMode = "FileRecovery";`
`265`	`266`	`azureWorkloadRecoveryConfig.FilePath = FilePath;`
`266`	`267`	`}`