Added tests

Author: Sambit Rath

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

@@ -55,6 +55,12 @@ public class AzureWorkloadRecoveryConfig : RecoveryConfigBase
 
         public string ContainerId { get; set; }
 
+        /// <summary>
+        /// Full RP on which log backups will be applied
+        /// </summary>
+        public RecoveryPointBase FullRP { get; set; }
+
+
         public AzureWorkloadRecoveryConfig(string targetServer, string targetInstance, string restoreRequestType,
             RecoveryPointBase recoveryPoint, DateTime pointInTime)
             : base(restoreRequestType, recoveryPoint, pointInTime)

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

@@ -377,7 +377,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 (AzureWorkloadRecoveryConfig)ProviderData[RestoreWLBackupItemParams.WLRecoveryConfig];
             RestoreRequestResource triggerRestoreRequest = new RestoreRequestResource();
 
-            if (wLRecoveryConfig.RecoveryPoint.ContainerName != null)
+            if (wLRecoveryConfig.RecoveryPoint.ContainerName != null && wLRecoveryConfig.FullRP == null)
             {
                 AzureWorkloadSQLRestoreRequest azureWorkloadSQLRestoreRequest =
                     new AzureWorkloadSQLRestoreRequest();

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ItemTests.cs

@@ -103,5 +103,14 @@ public void TestAzureVmWorkloadFullRestoreWithFiles()
             TestController.NewInstance.RunPsTest(
                 _logger, PsBackupProviderTypes.AzureWorkload, "Test-AzureVmWorkloadFullRestoreWithFiles");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(TestConstants.Workload, TestConstants.AzureVmWorkload)]
+        public void TestAzureVmWorkloadRestoreAsFiles()
+        {
+            TestController.NewInstance.RunPsTest(
+                _logger, PsBackupProviderTypes.AzureWorkload, "Test-AzureVmWorkloadRestoreAsFiles");
+        }
     }
 }

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ItemTests.ps1

@@ -16,6 +16,8 @@ $containerName = "psbvtsqlvm"
 $resourceGroupName = "pstestwlRG1bca8"
 $vaultName = "pstestwlRSV1bca8"
 $resourceId = "/subscriptions/38304e13-357e-405e-9e9a-220351dcce8c/resourceGroups/pscloudtestrg/providers/Microsoft.Compute/virtualMachines/psbvtsqlvm"
+$filepath = "C:\"
+$restoreAsFilesVault = "iaasvmsqlworkloadexistingvault1"
 $resourceIdForFileDB = $resourceId
 $policyName = "HourlyLogBackup"
 $instanceName = "sqlinstance;mssqlserver"
@@ -602,4 +604,51 @@ function Test-AzureVmWorkloadFullRestoreWithFiles
 	{
 			Cleanup-Vault $vault $item $container
 	}
+}
+
+function Test-AzureVmWorkloadRestoreAsFiles
+{
+	$vault = Get-AzRecoveryServicesVault -Name $restoreAsFilesVault
+	
+	$container = Get-AzRecoveryServicesBackupContainer `
+		-VaultId $vault.ID `
+		-ContainerType "AzureVMAppContainer";
+
+	$item = Get-AzRecoveryServicesBackupItem `
+		-VaultId $vault.ID `
+		-BackupManagementType "AzureWorkload" `
+		-WorkloadType "MSSQL";
+
+	$rp = Get-AzRecoveryServicesBackupRecoveryPoint -VaultId $vault.ID -Item $item
+	$time = get-date -Year 2020 -Month 1 -Day 30 -Minute 5
+	$config = Get-AzRecoveryServicesBackupWorkloadRecoveryConfig `
+		-VaultId $vault.ID -PointInTime $time -Item $item -RestoreAsFiles `
+		-FilePath $filepath -TargetContainer $container -FromFull $rp[3];
+
+	$restorejob1 = Restore-AzRecoveryServicesBackupItem `
+		-VaultId $vault.ID `
+		-WLRecoveryConfig $config | Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID;
+
+	Assert-True { $restorejob1.Status -eq "Completed" }
+
+	$config = Get-AzRecoveryServicesBackupWorkloadRecoveryConfig `
+		-VaultId $vault.ID -RecoveryPoint $rp[0] -Item $item -RestoreAsFiles `
+		-FilePath $filepath -TargetContainer $container;
+
+	$restorejob2 = Restore-AzRecoveryServicesBackupItem `
+		-VaultId $vault.ID `
+		-WLRecoveryConfig $config | Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+
+	Assert-True { $restorejob2.Status -eq "Completed" }
+
+	$config = Get-AzRecoveryServicesBackupWorkloadRecoveryConfig `
+		-VaultId $vault.ID -PointInTime $time -Item $item -RestoreAsFiles `
+		-FilePath $filepath -TargetContainer $container;
+
+	$restorejob3 = Restore-AzRecoveryServicesBackupItem `
+		-VaultId $vault.ID `
+		-WLRecoveryConfig $config | Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+
+	Assert-True { $restorejob3.Status -eq "Completed" }
+
 }

src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Restore/GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig.cs

@@ -98,7 +98,7 @@ public class GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig : RSBackupVa
         /// Specify Recovery point from which logs will be applies
         /// </summary>
         [Parameter(Mandatory = false)]
-        public RecoveryPointBase FromFul { get; set; }
+        public RecoveryPointBase FromFull { get; set; }
 
         /// <summary>
         /// Specify Recovery point from which logs will be applies
@@ -264,6 +264,7 @@ public override void ExecuteCmdlet()
                     azureWorkloadRecoveryConfig.RestoreRequestType = "Alternate WL Restore";
                     azureWorkloadRecoveryConfig.RecoveryMode = "FileRecovery";
                     azureWorkloadRecoveryConfig.FilePath = FilePath;
+                    azureWorkloadRecoveryConfig.FullRP = FromFull;
                 }
                 RecoveryConfigBase baseobj = azureWorkloadRecoveryConfig;
                 WriteObject(baseobj);
@@ -447,6 +448,19 @@ public AzureWorkloadRecoveryConfig GetConfigObject()
             {
                 restoreRequestType = "Alternate WL Restore";
                 targetServer = TargetContainer.Name;
+                if(recoveryPoint == null && FromFull == null)
+                {
+                    Models.AzureWorkloadRecoveryPoint azureWorkloadRecoveryPoint = new Models.AzureWorkloadRecoveryPoint()
+                    {
+                        Id = Item.Id + "/recoveryPoints/DefaultRangeRecoveryPoint",
+                        RecoveryPointId = "DefaultRangeRecoveryPoint"
+                    };
+                    recoveryPoint = azureWorkloadRecoveryPoint;
+                }
+                else if(FromFull != null)
+                {
+                    recoveryPoint = FromFull;
+                }
             }
 
             return new AzureWorkloadRecoveryConfig(targetServer, parentName, restoreRequestType, recoveryPoint, pointInTime);