making storage account and rg name optional for afs restore

Author: siddharth7

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/AzureFilesPsBackupProvider.cs

@@ -153,7 +153,8 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
             string vaultLocation = (string)ProviderData[VaultParams.VaultLocation];
             CmdletModel.AzureFileShareRecoveryPoint recoveryPoint = ProviderData[RestoreBackupItemParams.RecoveryPoint]
                 as CmdletModel.AzureFileShareRecoveryPoint;
-            string storageAccountName = ProviderData[RestoreBackupItemParams.StorageAccountName].ToString();
+            string storageAccountName = ProviderData.ContainsKey(RestoreBackupItemParams.StorageAccountName) ?
+                ProviderData[RestoreBackupItemParams.StorageAccountName].ToString() : null;
             string storageAccountResourceGroupName = ProviderData.ContainsKey(RestoreBackupItemParams.StorageAccountResourceGroupName) ?
                 ProviderData[RestoreBackupItemParams.StorageAccountResourceGroupName].ToString() : null;
             string copyOptions = (string)ProviderData[RestoreFSBackupItemParams.ResolveConflict];
@@ -180,7 +181,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 targetFolder = "/";
             }
 
-            GenericResource storageAccountResource = ServiceClientAdapter.GetStorageAccountResource(storageAccountName);
+            GenericResource storageAccountResource = ServiceClientAdapter.GetStorageAccountResource(recoveryPoint.ContainerName.Split(';')[2]);
             GenericResource targetStorageAccountResource = null;
             string targetStorageAccountLocation = null;
             if (targetStorageAccountName != null)

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

@@ -380,6 +380,60 @@ function Test-AzureFSFullRestore
 				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
 
 		Assert-True { $restoreJob4.Status -eq "Completed" }
+    
+		# Test without storage account dependancy
+		# Item level restore at alternate location
+		$restoreJob5 = Restore-AzureRmRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $recoveryPoint[0] `
+			-ResolveConflict Overwrite `
+			-SourceFilePath $folderPath `
+			-SourceFileType Directory `
+			-TargetStorageAccountName $targetSaName `
+			-TargetFileShareName $targetFileShareName `
+			-TargetFolder $targetFolder | `
+				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+		
+		Assert-True { $restoreJob5.Status -eq "Completed" }
+    
+		# Test without storage account dependancy
+		# Full share restore at alternate location
+		$restoreJob6 = Restore-AzureRmRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $recoveryPoint[0] `
+			-ResolveConflict Overwrite `
+			-TargetStorageAccountName $targetSaName `
+			-TargetFileShareName $targetFileShareName `
+			-TargetFolder $targetFolder | `
+				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+		
+		Assert-True { $restoreJob6.Status -eq "Completed" }
+
+		# Test without storage account dependancy
+		# Item level restore at original location
+		$restoreJob7 = Restore-AzureRmRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $recoveryPoint[0] `
+			-ResolveConflict Overwrite `
+			-SourceFilePath $filePath `
+			-SourceFileType File | `
+				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+
+		Assert-True { $restoreJob7.Status -eq "Completed" }
+
+		# Test without storage account dependancy
+		# Full share restore at original location
+		$restoreJob8 = Restore-AzureRmRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $recoveryPoint[0] `
+			-ResolveConflict Overwrite | `
+				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+
+		Assert-True { $restoreJob8.Status -eq "Completed" }
 	}
 	finally
 	{