Skip to content

Commit a30d053

Browse files
author
Maddie Clayton
authored
Merge pull request #7801 from MabOneSdk/afs_dev
[RecoveryServices.Backup] Fixed modify policy for protected file share
2 parents 1bd8d10 + 7217ed0 commit a30d053

File tree

4 files changed

+17167
-12096
lines changed

4 files changed

+17167
-12096
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -929,11 +929,6 @@ private void ValidateAzureFilesModifyProtectionRequest(ItemBase itemBase,
929929
throw new ArgumentException(string.Format(Resources.InvalidProtectionPolicyException,
930930
typeof(AzureFileShareItem).ToString()));
931931
}
932-
933-
if (string.IsNullOrEmpty(((AzureFileShareItem)itemBase).ParentContainerFabricId))
934-
{
935-
throw new ArgumentException(Resources.ParentContainerFabricIdIsEmptyOrNull);
936-
}
937932
}
938933
}
939934
}

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ $folderPath = "pstestfolder1bca8f8e"
2626
$filePath = "pstestfolder1bca8f8e/pstestfile1bca8f8e.txt"
2727
$skuName="Standard_LRS"
2828
$policyName = "AFSBackupPolicy"
29+
$newPolicyName = "NewAFSBackupPolicy"
2930

3031
# Setup Instructions:
3132
# 1. Create a resource group
@@ -171,7 +172,7 @@ function Test-AzureFSProtection
171172

172173
$policy = Get-AzureRmRecoveryServicesBackupProtectionPolicy `
173174
-VaultId $vault.ID `
174-
-WorkloadType AzureFiles
175+
-Name $policyName
175176

176177
$enableJob = Enable-AzureRmRecoveryServicesBackupProtection `
177178
-VaultId $vault.ID `
@@ -191,6 +192,26 @@ function Test-AzureFSProtection
191192
-WorkloadType AzureFiles
192193
Assert-True { $item.Name -contains $fileShareName }
193194
Assert-True { $item.LastBackupStatus -eq "IRPending" }
195+
Assert-True { $item.ProtectionPolicyName -eq $policyName }
196+
197+
# Modify Policy
198+
$newPolicy = Get-AzureRmRecoveryServicesBackupProtectionPolicy `
199+
-VaultId $vault.ID `
200+
-Name $newPolicyName
201+
202+
$enableJob = Enable-AzureRmRecoveryServicesBackupProtection `
203+
-VaultId $vault.ID `
204+
-Policy $newPolicy `
205+
-Item $item
206+
207+
$item = Get-AzureRmRecoveryServicesBackupItem `
208+
-VaultId $vault.ID `
209+
-Container $container `
210+
-WorkloadType AzureFiles
211+
212+
Assert-True { $item.Name -contains $fileShareName }
213+
Assert-True { $item.LastBackupStatus -eq "IRPending" }
214+
Assert-True { $item.ProtectionPolicyName -eq $newPolicyName }
194215
}
195216
finally
196217
{

0 commit comments

Comments
 (0)