Added ExpiryTime, AFS Job, AFS restore changes (Azure#22479)

Added test cases

Author: hiaga

src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs

@@ -430,7 +430,9 @@ private static CmdletModel.JobBase GetPSAzureFileShareJob(JobResource serviceCli
             response.Duration = GetJobDuration(fileShareJob.Duration);
             response.Status = fileShareJob.Status;
             response.WorkloadName = fileShareJob.EntityFriendlyName;
-            response.ActivityId = fileShareJob.ActivityId;
+            response.ActivityId = fileShareJob.ActivityId;            
+            response.StorageAccountName = fileShareJob.StorageAccountName;
+
             response.BackupManagementType =
                 CmdletModel.ConversionUtils.GetPsBackupManagementType(fileShareJob.BackupManagementType);
             response.Operation = fileShareJob.Operation;

src/RecoveryServices/RecoveryServices.Backup.Models/AzureFileShareModels/AzureFileShareJob.cs

@@ -19,7 +19,13 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     /// <summary>
     /// Represents Azure File Share specific job class.
     /// </summary>
-    public class AzureFileShareJob : AzureJob { }
+    public class AzureFileShareJob : AzureJob
+    {
+        /// <summary>
+        /// Storage account name for Azure file share.
+        /// </summary>
+        public string StorageAccountName { get; set; }
+    }
 
     /// <summary>
     /// Azure File Share specific job details class.

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -383,7 +383,8 @@ public RestAzureNS.AzureOperationResponse TriggerBackup()
             string vaultName = (string)ProviderData[VaultParams.VaultName];
             string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             ItemBase item = (ItemBase)ProviderData[ItemParams.Item];
-            DateTime? expiryDateTime = (DateTime?)ProviderData[ItemParams.ExpiryDateTimeUTC];
+            // setting the default expiry time of 30 days for AzureVM workload, this doesn't apply to MSSQL workload as the default value for SQL is 45 days.
+            DateTime? expiryDateTime = (ProviderData[ItemParams.ExpiryDateTimeUTC] != null) ? (DateTime?)ProviderData[ItemParams.ExpiryDateTimeUTC] : DateTime.UtcNow.AddDays(30);
             AzureVmItem iaasVmItem = item as AzureVmItem;
             BackupRequestResource triggerBackupRequest = new BackupRequestResource();
             IaasVMBackupRequest iaasVmBackupRequest = new IaasVMBackupRequest();

src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs

@@ -50,7 +50,7 @@ public RestAzureNS.AzureOperationResponse RestoreDisk(
             //validtion block
             if (!triggerRestoreRequest.Properties.GetType().IsSubclassOf(typeof(AzureWorkloadRestoreRequest)))
             {
-                if (storageAccountLocation != vaultLocation)
+                if (storageAccountLocation != vaultLocation && rp.BackupManagementType != Models.BackupManagementType.AzureStorage)
                 {
                     throw new Exception(Resources.TriggerRestoreIncorrectRegion);
                 }
@@ -114,7 +114,7 @@ public RestAzureNS.AzureOperationResponse RestoreDiskSecondryRegion(
             //validation block
             if (!triggerCRRRestoreRequest.RestoreRequest.GetType().IsSubclassOf(typeof(CrrModel.AzureWorkloadRestoreRequest)))
             {
-                if (storageAccountLocation != secondaryRegion)
+                if (storageAccountLocation != secondaryRegion && rp.BackupManagementType != Models.BackupManagementType.AzureStorage)
                 {
                     throw new Exception(Resources.TriggerRestoreIncorrectRegion);
                 }

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

@@ -83,5 +83,17 @@ public void TestAzureFSFullRestore()
                 "Test-AzureFSFullRestore"
             );
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(TestConstants.Workload, TestConstants.AzureFS)]
+        public void TestAzureFSRestoreToAnotherRegion()
+        {
+            TestRunner.RunTestScript(
+                $"Import-Module {_AzureFilescommonModule.AsAbsoluteLocation()}",
+                $"Import-Module {_AzureFilestestModule.AsAbsoluteLocation()}",
+                "Test-AzureFSRestoreToAnotherRegion"
+            );
+        }
     }
 }

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

@@ -52,6 +52,38 @@ $newPolicyName = "NewAFSBackupPolicy"
 #		-RetentionPolicy $retentionPolicy `
 #		-SchedulePolicy $schedulePolicy
 
+function Test-AzureFSRestoreToAnotherRegion
+{
+	# testing AFS restore to different region and resource group than the source
+	$targetFileShareName = "drfs"
+	$targetSaName = "afsrestorediffregion2"
+
+	try
+	{
+		$vault = Get-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName
+		$items = Get-AzRecoveryServicesBackupItem -VaultId $vault.ID -BackupManagementType AzureStorage -WorkloadType AzureFiles
+
+		$backupJob = Backup-Item $vault $items[0]
+
+		$backupStartTime = $backupJob.StartTime.AddMinutes(-1);
+		$backupEndTime = $backupJob.EndTime.AddMinutes(1);
+
+		$rp = Get-AzRecoveryServicesBackupRecoveryPoint `
+			-VaultId $vault.ID `
+			-StartDate $backupStartTime `
+			-EndDate $backupEndTime `
+			-Item $items[0];
+			
+		$restoreJob = Restore-AzRecoveryServicesBackupItem -RecoveryPoint $rp[0] -ResolveConflict Overwrite -VaultId $vault.ID -VaultLocation $vault.Location -TargetStorageAccountName $targetSaName -TargetFileShareName $targetFileShareName | Wait-AzRecoveryServicesBackupJob -VaultId $vault.ID
+
+		Assert-True { $restoreJob.Status -eq "Completed" }
+	}
+	finally
+	{
+		# no cleanup
+	}
+}
+
 function Test-AzureFSItem
 {
 	try

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/JobTests.ps1

@@ -62,7 +62,11 @@ function Test-AzureFSGetJob
 			$jobDetails2 = Get-AzRecoveryServicesBackupJobDetail -VaultId $vault.ID -JobId $job.JobId
 
 			Assert-AreEqual $jobDetails.JobId $job.JobId
+			# validation for StorageAccountName filed in job response
+			Assert-AreEqual $jobDetails.StorageAccountName $saName 
+
 			Assert-AreEqual $jobDetails2.JobId $job.JobId
+			Assert-AreEqual $jobDetails2.StorageAccountName $saName
 		}
 
 		$container = Get-AzRecoveryServicesBackupContainer `

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

@@ -74,7 +74,7 @@ public void TestAzureVmWorkloadEnableAutoProtectableItem()
             );
         }
 
-        [Fact(Skip = "To be fixed in upcoming release")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(TestConstants.Workload, TestConstants.AzureVmWorkload)]
         public void TestAzureVmWorkloadBackupProtectionItem()

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

@@ -327,33 +327,26 @@ function Test-AzureVmWorkloadEnableAutoProtectableItem
 
 function Test-AzureVmWorkloadBackupProtectionItem
 {
+	$resourceGroupName = "hiagarg"
+	$vaultName = "hiagaVault"	
+	$sourceDBName = "master"
+
 	try
-	{
+	{   
+		# test trigger adhoc backup
 		$vault = Get-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName
-		$container = Register-AzRecoveryServicesBackupContainer `
-			-ResourceId $resourceId `
-			-BackupManagementType AzureWorkload `
-			-WorkloadType MSSQL `
-			-VaultId $vault.ID `
-			-Force
-
-		Enable-Protection $vault $container
-
-		$item = Get-AzRecoveryServicesBackupItem `
-			-VaultId $vault.ID `
-			-Container $container `
-			-WorkloadType MSSQL;
+		$item = Get-AzRecoveryServicesBackupItem -BackupManagementType AzureWorkload -WorkloadType MSSQL -VaultId $vault.ID | Where-Object { $_.Name -match $sourceDBName }
 
 		$backupJob = Backup-AzRecoveryServicesBackupItem `
 			-VaultId $vault.ID `
-			-Item $item `
+			-Item $item[0] `
 			-BackupType "Full" | Wait-AzRecoveryServicesBackupJob -VaultId $vault.ID
 
 		Assert-True { $backupJob.Status -eq "Completed" }
 	}
 	finally
 	{
-		Cleanup-Vault $vault $item $container
+		# no cleanup
 	}
 }