Skip to content

Commit 486e43a

Browse files
author
Samuel Anudeep
committed
Container, Item, Job and Policy Tests (6 pending) for IaaS VM
1 parent 13df1d4 commit 486e43a

File tree

18 files changed

+23364
-1291
lines changed

18 files changed

+23364
-1291
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,11 @@ public List<ContainerBase> ListProtectionContainers()
485485
}
486486
else
487487
{
488+
var statusString = status.ToString();
488489
queryParams = new ODataQuery<BMSContainerQueryObject>(
489490
q => q.FriendlyName == nameQueryFilter &&
490491
q.BackupManagementType == ServiceClientModel.BackupManagementType.AzureIaasVM &&
491-
q.Status == status.ToString());
492+
q.Status == statusString);
492493
}
493494

494495
var listResponse = ServiceClientAdapter.ListContainers(queryParams);

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<SpecificVersion>False</SpecificVersion>
4949
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
5050
</Reference>
51+
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.2.0-preview\lib\net45\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
54+
</Reference>
5155
<Reference Include="Microsoft.Azure.ResourceManager">
5256
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5357
</Reference>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
Test Recovery Services Backup Vault
1818
#>
1919

20-
$resourceGroupName = "labRG1";
21-
$resourceName = "pstestrsvault";
20+
$resourceGroupName = "RecoveryServicesBackupTestRg";
21+
$resourceName = "PsTestRsVault";
2222
$defaultPolicyName = "DefaultPolicy";
2323
# Create VM instead of taking these as parameters
24-
$vmResourceGroupName = "arpittestresourcegroup";
25-
$vmName = "arpittestencvm1";
26-
$vmStorageAccountName = "mkheranirmrestore";
27-
$vmStorageAccountResourceGroup = "mkheranirmrestore";
24+
$vmResourceGroupName = "pstestrg";
25+
$vmName = "pstestv2vm1";
26+
$vmStorageAccountName = "pstestrg4762";
27+
$vmStorageAccountResourceGroup = "pstestrg";
2828
$vmUniqueName = "iaasvmcontainerv2;" + $vmResourceGroupName + ";" + $vmName;
2929

3030
function Test-GetContainerScenario

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15-
$resourceGroupName = "labRG1";
16-
$resourceName = "pstestrsvault";
15+
$resourceGroupName = "RecoveryServicesBackupTestRg";
16+
$resourceName = "PsTestRsVault";
1717
$defaultPolicyName = "DefaultPolicy";
1818
# Create VM instead of taking these as parameters
19-
$vmResourceGroupName = "arpittestresourcegroup";
20-
$vmName = "arpittestencvm1";
21-
$vmStorageAccountName = "mkheranirmrestore";
22-
$vmStorageAccountResourceGroup = "mkheranirmrestore";
19+
$vmResourceGroupName = "pstestrg";
20+
$vmName = "pstestv2vm1";
21+
$vmStorageAccountName = "pstestrg4762";
22+
$vmStorageAccountResourceGroup = "pstestrg";
2323
$vmUniqueName = "iaasvmcontainerv2;" + $vmResourceGroupName + ";" + $vmName;
2424

2525
function Test-GetItemScenario
2626
{
27+
2728
# 1. Create / update and get vault
28-
#$vaultLocation = get_available_location;
29-
$vault = New-AzureRmRecoveryServicesVault `
30-
-Name $resourceName -ResourceGroupName $resourceGroupName -Location "westus";
29+
$vaultLocation = get_available_location;
30+
New-AzureRmResourceGroup -Name $resourceGroupName -Location $vaultLocation -Force;
31+
$vault = New-AzureRmRecoveryServicesVault `
32+
-Name $resourceName -ResourceGroupName $resourceGroupName -Location $vaultLocation;
3133

3234
# 2. Set vault context
3335
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
@@ -55,7 +57,7 @@ function Test-GetItemScenario
5557
-Status Registered;
5658
}
5759

58-
$protectionState = if ($global:container -eq $null) { "IRPending" } else { "Protected" };
60+
$protectionState = "IRPending";
5961

6062
# VAR-1: Get all items for container
6163
$item = Get-AzureRmRecoveryServicesBackupItem `

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/JobTests.ps1

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
$resourceGroupName = "RecoveryServicesBackupTestRg";
16+
$resourceName = "PsTestRsVault";
17+
1518
#Have to hard-code this because time keeps changing with every run and we cannot use recorded sessions
16-
$fixedStartDate = Get-Date -Date "2016-04-17 11:30:00Z"
19+
$fixedStartDate = Get-Date -Date "2016-10-26 11:30:00Z"
1720
$fixedStartDate = $fixedStartDate.ToUniversalTime()
18-
$fixedEndDate = Get-Date -Date "2016-04-18 11:30:00Z"
21+
$fixedEndDate = Get-Date -Date "2016-10-27 11:30:00Z"
1922
$fixedEndDate = $fixedEndDate.ToUniversalTime()
23+
$waitEndDate = Get-Date -Date "2016-10-28 11:30:00Z"
24+
$waitEndDate = $waitEndDate.ToUniversalTime()
2025

2126
function SetVaultContext
2227
{
23-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
28+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $resourceName;
2429
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
2530
}
2631

@@ -123,7 +128,7 @@ function Test-GetJobDetails
123128
function Test-WaitJobScenario
124129
{
125130
SetVaultContext;
126-
$jobs = Get-AzureRmRecoveryServicesBackupJob -From $fixedStartDate -To $fixedEndDate
131+
$jobs = Get-AzureRmRecoveryServicesBackupJob -From $fixedStartDate -To $waitEndDate
127132
foreach ($job in $jobs)
128133
{
129134
$waitedJob = Wait-AzureRmRecoveryServicesBackupJob -Job $job

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/PolicyTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15-
$resourceGroupName = "labRG1";
16-
$resourceName = "pstestrsvault";
17-
$policyName = "pwtest1";
15+
$resourceGroupName = "RecoveryServicesBackupTestRg";
16+
$resourceName = "PsTestRsVault";
17+
$policyName = "PsTestPolicy";
1818

1919
function Test-PolicyScenario
2020
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
using ResourceManagementNS = Microsoft.Azure.Management.Resources;
3535
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
3636
using HyakRmNS = Microsoft.Azure.Management.Internal.Resources;
37+
using ResourceManagementRestNS = Microsoft.Azure.Management.ResourceManager;
3738

3839
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
3940
{
@@ -48,6 +49,8 @@ public class TestController
4849

4950
public ResourceManagementNS.ResourceManagementClient RmClient { get; private set; }
5051

52+
public ResourceManagementRestNS.ResourceManagementClient RmRestClient { get; private set; }
53+
5154
public HyakRmNS.ResourceManagementClient HyakRmClient { get; private set; }
5255

5356
protected string ResourceNamespace { get; private set; }
@@ -75,7 +78,8 @@ protected void SetupManagementClients(RestTestFramework.MockContext context)
7578
{
7679
RsBackupClient = GetRsBackupClient(context);
7780
RsClient = GetRsClient();
78-
RmClient = GetResourceManagementClient();
81+
RmClient = GetRmClient();
82+
RmRestClient = GetRmRestClient(context);
7983
HyakRmClient = GetHyakRmClient();
8084
//SubscriptionClient = GetSubscriptionClient();
8185
//CognitiveServicesClient = GetCognitiveServicesManagementClient(context);
@@ -86,14 +90,20 @@ protected void SetupManagementClients(RestTestFramework.MockContext context)
8690
RsBackupClient,
8791
RsClient,
8892
RmClient,
93+
RmRestClient,
8994
HyakRmClient);
9095
}
9196

92-
private ResourceManagementNS.ResourceManagementClient GetResourceManagementClient()
97+
private ResourceManagementNS.ResourceManagementClient GetRmClient()
9398
{
9499
return TestBase.GetServiceClient<ResourceManagementNS.ResourceManagementClient>(this.csmTestFactory);
95100
}
96101

102+
private ResourceManagementRestNS.ResourceManagementClient GetRmRestClient(RestTestFramework.MockContext context)
103+
{
104+
return context.GetServiceClient<ResourceManagementRestNS.ResourceManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
105+
}
106+
97107
private HyakRmNS.ResourceManagementClient GetHyakRmClient()
98108
{
99109
return TestBase.GetServiceClient<HyakRmNS.ResourceManagementClient>(this.csmTestFactory);

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ContainerTests/TestGetContainerScenario.json

Lines changed: 7004 additions & 88 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ItemTests/TestDisableAzureVMProtectionScenario.json

Lines changed: 3340 additions & 185 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ItemTests/TestEnableAzureVMProtectionScenario.json

Lines changed: 12032 additions & 335 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ItemTests/TestGetItemScenario.json

Lines changed: 451 additions & 193 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobDetails.json

Lines changed: 40 additions & 159 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobs.json

Lines changed: 41 additions & 38 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobsBackupManagementTypeFilter.json

Lines changed: 41 additions & 38 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)