Skip to content

Added support for updating CrossSubscriptionRestoreState of the vault #21583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wyunchi-ms merged 3 commits into from
Apr 20, 2023
Merged

Added support for updating CrossSubscriptionRestoreState of the vault #21583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed72742
Added support for updating CrossSubscriptionRestoreState of the vault
hiaga Apr 17, 2023
b105df4
added new testcase
hiaga Apr 18, 2023
034c28a
Re-recorded backup test cases
hiaga Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ItemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,17 @@ public void TestAzureVmWorkloadRestoreAsFiles()
"Test-AzureVmWorkloadRestoreAsFiles"
);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVmWorkload)]
public void TestAzureVmWorkloadCrossSubscriptionRestore()
{
TestRunner.RunTestScript(
$"Import-Module {_AzureWorkloadcommonModule.AsAbsoluteLocation()}",
$"Import-Module {_AzureWorkloadtestModule.AsAbsoluteLocation()}",
"Test-AzureVmWorkloadCrossSubscriptionRestore"
);
}
}
}
22 changes: 22 additions & 0 deletions src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ItemTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,28 @@ $resourceIdForFileDB = $resourceId
$policyName = "HourlyLogBackup"
$instanceName = "sqlinstance;mssqlserver"

function Test-AzureVmWorkloadCrossSubscriptionRestore
{
$resourceGroupName = "sqlcontainer-pstest-rg"
$vaultName = "sqlcontainer-pstest-vault"
$location = "centraluseuap"

try
{
$vault = Get-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName
Assert-True { $vault.Properties.RestoreSettings.CrossSubscriptionRestoreSettings.CrossSubscriptionRestoreState -eq "Enabled" }

# Disable/Enable CSR state
$vault = Update-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName -CrossSubscriptionRestoreState Disabled
Assert-True { $vault.Properties.RestoreSettings.CrossSubscriptionRestoreSettings.CrossSubscriptionRestoreState -eq "Disabled" }
}
finally
{
$vault = Update-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName -CrossSubscriptionRestoreState Enabled
Assert-True { $vault.Properties.RestoreSettings.CrossSubscriptionRestoreSettings.CrossSubscriptionRestoreState -eq "Enabled" }
}
}

function Test-AzureVmWorkloadProtectableItem
{
try
Expand Down
10 changes: 5 additions & 5 deletions src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void TestAzureVMGetItems()
);
}

[Fact]
[Fact(Skip = "Skipping for this release because backup job is taking hours of time.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVM)]
public void TestAzureVMProtection()
Expand All @@ -60,7 +60,7 @@ public void TestAzureVMBackup()
);
}

[Fact]
[Fact(Skip = "Skipping for this release because backup job is taking hours of time.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVM)]
public void TestAzureVMGetRPs()
Expand All @@ -72,7 +72,7 @@ public void TestAzureVMGetRPs()
);
}

[Fact]
[Fact(Skip = "Skipping for this release because backup job is taking hours of time.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVM)]
public void TestAzureVMFullRestore()
Expand Down Expand Up @@ -124,7 +124,7 @@ public void TestAzureVMRPMountScript()
//Assert.True(AzureSession.Instance.DataStore.FileExists(mountScriptDetails.FilePath));
}

[Fact]
[Fact(Skip = "Skipping for this release because backup job is taking hours of time.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVM)]
public void TestAzureVMSetVaultContext()
Expand Down Expand Up @@ -196,7 +196,7 @@ public void TestAzureVMCrossRegionRestore()
);
}

[Fact(Skip = "to be re-recorded in next release")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(TestConstants.Workload, TestConstants.AzureVM)]
public void TestAzureVMRestoreWithMSI()
Expand Down
2 changes: 1 addition & 1 deletion src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function Test-AzureCrossZonalRestore
$targetVNetName = "hiagaNZPVNet"
$targetVNetRG = "hiagarg"
$targetSubnetName = "custom"
$recoveryPointId = "166059983345323" # latest vaultStandard recovery point
$recoveryPointId = "174747612387318" # latest vaultStandard recovery point

try
{
Expand Down
Loading