Skip to content

Commit 41b18fe

Browse files
pikumarmsft16pikumarmsft16
committed
Fixing bugs of powershell tests and saving recordings except e2e.
1 parent d65a784 commit 41b18fe

File tree

30 files changed

+10355
-80
lines changed

30 files changed

+10355
-80
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
4-
<add key="ResourceName" value="backuprn1" />
4+
<add key="ResourceName" value="backuprn" />
55
<add key="ResourceGroupName" value="backuprg" />
66
<add key="ResourceId" value="7368183945769329045" />
77
<add key="ClientSettingsProvider.ServiceUri" value="" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,22 +165,90 @@
165165
<None Include="ScenarioTests\AzureBackupContainerTests.ps1">
166166
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
167167
</None>
168-
<None Include="ScenarioTests\AzureBackupItemTestCases.ps1" />
169-
<None Include="ScenarioTests\AzureBackupJobTests.ps1" />
170-
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1" />
171-
<None Include="ScenarioTests\AzureBackupScenarioTests.ps1" />
168+
<None Include="ScenarioTests\AzureBackupItemTestCases.ps1">
169+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170+
</None>
171+
<None Include="ScenarioTests\AzureBackupJobTests.ps1">
172+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
173+
</None>
174+
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
175+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
176+
</None>
177+
<None Include="ScenarioTests\AzureBackupScenarioTests.ps1">
178+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
179+
</None>
172180
<None Include="ScenarioTests\AzureBackupVaultTests.ps1">
173181
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
174182
</None>
175-
<None Include="ScenarioTests\BackupItemTests.ps1" />
176-
<None Include="ScenarioTests\RecoveryPointTests.ps1" />
177-
<None Include="ScenarioTests\RestoreItemTests.ps1" />
183+
<None Include="ScenarioTests\BackupItemTests.ps1">
184+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
185+
</None>
186+
<None Include="ScenarioTests\RecoveryPointTests.ps1">
187+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
188+
</None>
189+
<None Include="ScenarioTests\RestoreItemTests.ps1">
190+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191+
</None>
192+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupContainerScenarioTests.json">
193+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
194+
</None>
178195
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupMarsContainerScenarioTests.json">
179196
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
180197
</None>
198+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupRegisterContainerScenarioTests.json">
199+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
200+
</None>
201+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupUnregisterContainerScenarioTests.json">
202+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
203+
</None>
204+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\DisableAzureBackupProtectionTest.json">
205+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
206+
</None>
207+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\EnableAzureBackupProtectionTest.json">
208+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
209+
</None>
210+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\ListAzureBackupItemTests.json">
211+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212+
</None>
213+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests\GetAzureRMBackupJobTests.json">
214+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
215+
</None>
216+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests\StopAzureRMBackupJobTests.json">
217+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
218+
</None>
219+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\ListProtectionPolicyByNameTests.json">
220+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
221+
</None>
222+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\ListProtectionPolicyTests.json">
223+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
224+
</None>
225+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\NewProtectionPolicyTests.json">
226+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
227+
</None>
228+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\RemoveProtectionPolicyTests.json">
229+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
230+
</None>
231+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\SetProtectionPolicyTests.json">
232+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
233+
</None>
234+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupScenarioTests\AzureBackupEndToEndTests.json">
235+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
236+
</None>
181237
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests\AzureBackupVaultScenarioTests.json">
182238
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
183239
</None>
240+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.BackupItemTests\BackUpAzureBackUpItem.json">
241+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
242+
</None>
243+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RecoveryPointTests\GetRecoveryPointsTests.json">
244+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245+
</None>
246+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RecoveryPointTests\GetRecoveryPointTests.json">
247+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
248+
</None>
249+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RestoreItemTests\RestoreAzureBackUpItem.json">
250+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
251+
</None>
184252
</ItemGroup>
185253
<ItemGroup />
186254
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
# ----------------------------------------------------------------------------------
1414

1515
$ResourceGroupName = "backuprg"
16-
$ResourceName = "backuprn1"
16+
$ResourceName = "backuprn"
1717
$ContainerName = "DPMDRSCALEINT1.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM"
1818
$ContainerType = "Windows"
19-
$ContainerId = "10034"
19+
$ContainerId = "213698"
2020
$ContainerStatus = "Registered"
2121

2222
function Test-AzureBackupMarsContainerScenario
@@ -67,7 +67,7 @@ function Test-RegisterAzureBackupContainer
6767

6868
function Test-UnregisterAzureBackupContainer
6969
{
70-
$vault = Get-AzureRMBackupVault -$VaultResourceRGName mkheranirg -Name $VaultResourceName
70+
$vault = Get-AzureRMBackupVault -Name $VaultResourceName
7171
$container = Get-AzureRMBackupContainer -Name $IaasVMManagedResourceName -Type AzureVM -ManagedResourceGroupName $IaasVMManagedResourceGroupName -Vault $vault
7272
$jobId = Unregister-AzureRMBackupContainer -Container $container
7373

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupItemTestCases.ps1

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
$ResourceName = "backuprn"
33
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
44
$ContainerType = "IaasVMContainer"
5-
$DataSourceType = "VM"
5+
$DataSourceType = "IaasVM"
66
$DataSourceId = "17593283453810"
77
$Location = "SouthEast Asia"
8-
$PolicyName = "Policy9";
9-
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
10-
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
8+
$PolicyName = "ProtPolicy01";
9+
$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/protectionPolicies/DefaultPolicy";
10+
$POName = "hydrarecordvm"
11+
$itemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
1112

1213

1314
function Test-GetAzureBackupItemTests
1415
{
15-
$azureBackUpContainer = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupContainer
16+
$azureBackUpContainer = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupContainer
1617
$azureBackUpContainer.ResourceGroupName = $ResourceGroupName
1718
$azureBackUpContainer.ResourceName = $ResourceName
1819
$azureBackUpContainer.Location = $Location
@@ -37,39 +38,33 @@ function Test-GetAzureBackupItemTests
3738

3839
function Test-EnableAzureBackupProtection
3940
{
40-
$policy = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupProtectionPolicy
41-
$policy.InstanceId = $PolicyId
42-
$policy.Name = $PolicyName
43-
$policy.ResourceGroupName = $ResourceGroupName
44-
$policy.ResourceName = $ResourceName
45-
$policy.Location = $Location
46-
$policy.WorkloadType = "VM"
47-
$policy.RetentionType = "1"
48-
$policy.ScheduleRunTimes = "2015-06-13T20:30:00"
41+
$vault = Get-AzureRMBackupVault -Name $ResourceName
42+
$policyList = Get-AzureRMBackupProtectionPolicy -Vault $vault
43+
$policy = $policyList[0]
4944

50-
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
45+
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
5146
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
5247
$azureBackUpItem.ResourceName = $ResourceName
5348
$azureBackUpItem.Location = $Location
5449
$azureBackUpItem.ContainerUniqueName = $ContainerName
5550
$azureBackUpItem.ContainerType = $ContainerType
56-
$azureBackUpItem.DataSourceId = $DataSourceId
5751
$azureBackUpItem.Type = $DataSourceType
5852
$azureBackUpItem.Name = $POName
53+
$azureBackUpItem.ItemName = $itemName
5954
$jobId = Enable-AzureRMBackupProtection -Item $azureBackUpItem -Policy $policy
6055

6156
}
6257

6358
function Test-DisableAzureBackupProtection
6459
{
65-
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
60+
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
6661
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
6762
$azureBackUpItem.ResourceName = $ResourceName
6863
$azureBackUpItem.Location = $Location
6964
$azureBackUpItem.ContainerUniqueName = $ContainerName
7065
$azureBackUpItem.ContainerType = $ContainerType
71-
$azureBackUpItem.DataSourceId = $DataSourceId
7266
$azureBackUpItem.Type = $DataSourceType
67+
$azureBackUpItem.ItemName = $itemName
7368
$azureBackUpItem.Name = $POName
7469
$jobId1 = Disable-AzureRMBackupProtection -Item $azureBackUpItem
7570
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupJobTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
1919
{
20-
public class AzureRMBackupJobTests : AzureBackupTestsBase
20+
public class AzureBackupJobTests : AzureBackupTestsBase
2121
{
2222

2323
[Fact]

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupJobTests.ps1

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ $Location = "SouthEast Asia"
88
$PolicyName = "Policy9";
99
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
1010
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
11+
$ItemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
1112

13+
# startTime%20eq%20'2015-07-15%2009:39:29%20AM'%20and%20endTime%20eq%20'2015-08-14%2009:39:29%20AM'",
1214

1315
function Test-GetAzureRMBackupJob
1416
{
15-
$vault = Get-AzureBackupVault -Name $ResourceName;
16-
$OneMonthBack = Get-Date;
17-
$OneMonthBack = $OneMonthBack.AddDays(-30);
18-
$jobs = Get-AzureRMBackupJob -Vault $vault -From $OneMonthBack
17+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
18+
$OneMonthBack = Get-Date -Date "2015-07-15 09:39:29Z";
19+
$now = Get-Date -Date "2015-08-14 09:39:29Z";
20+
$jobs = Get-AzureRMBackupJob -Vault $vault -From $OneMonthBack -To $now
1921
Assert-NotNull $jobs 'Jobs list should not be null'
2022
foreach($job in $jobs)
2123
{
@@ -41,19 +43,13 @@ function Test-GetAzureRMBackupJob
4143

4244
function Test-StopAzureRMBackupJob
4345
{
44-
$OneMonthBack = Get-Date;
45-
$OneMonthBack = $OneMonthBack.AddDays(-30);
46-
47-
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
48-
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
49-
$azureBackUpItem.ResourceName = $ResourceName
50-
$azureBackUpItem.Location = $Location
51-
$azureBackUpItem.ContainerUniqueName = $ContainerName
52-
$azureBackUpItem.ContainerType = $ContainerType
53-
$azureBackUpItem.DataSourceId = $DataSourceId
54-
$azureBackUpItem.Type = $DataSourceType
55-
56-
$job = Backup-AzureBackupItem -Item $azureBackUpItem
46+
$AzureRMBackupItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
47+
$AzureRMBackupItem.ResourceGroupName = $ResourceGroupName
48+
$AzureRMBackupItem.ResourceName = $ResourceName
49+
$AzureRMBackupItem.Location = $Location
50+
$AzureRMBackupItem.ContainerUniqueName = $ContainerName
51+
$AzureRMBackupItem.ItemName = $ItemName
52+
$job = Backup-AzureRMBackupItem -Item $AzureRMBackupItem
5753

5854
Stop-AzureRMBackupJob -Job $job;
5955
Wait-AzureRMBackupJob -Job $job;

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $Location = "SouthEast Asia"
1919
$PolicyName = "Policy10";
2020
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
2121
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
22-
$Type = "IaasVM"
22+
$Type = "AzureVM"
2323
$RetentionType = "Days"
2424
$BackupTime = "2015-06-13T20:30:00"
2525
$DaysOfWeek = "Monday"
@@ -33,12 +33,11 @@ Tests creating new resource group and a simple resource.
3333
#>
3434
function Test-GetAzureBackupProtectionPolicyTests
3535
{
36-
$vault = Get-AzureBackupVault -Name $ResourceName;
36+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
3737
$protectionPolicies = Get-AzureRMBackupProtectionPolicy -vault $vault
3838
Assert-NotNull $protectionPolicies 'Protection Policies should not be null'
3939
foreach($protectionPolicy in $protectionPolicies)
4040
{
41-
Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
4241
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
4342
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
4443
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
@@ -51,10 +50,9 @@ function Test-GetAzureBackupProtectionPolicyTests
5150

5251
function Test-GetAzureBackupProtectionPolicyByNameTests
5352
{
54-
$vault = Get-AzureBackupVault -Name $ResourceName;
53+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
5554
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
5655

57-
Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
5856
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
5957
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
6058
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
@@ -67,14 +65,13 @@ function Test-GetAzureBackupProtectionPolicyByNameTests
6765

6866
function Test-NewAzureBackupProtectionPolicyTests
6967
{
70-
$vault = Get-AzureBackupVault -Name $ResourceName;
68+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
7169
$r1 = New-AzureRMBackupRetentionPolicyObject -DailyRetention -Retention 20
7270
$r2 = New-AzureRMBackupRetentionPolicyObject -WeeklyRetention -DaysOfWeek "Monday" -Retention 10
7371
$r = ($r1, $r2)
7472

75-
$protectionPolicy = New-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName -Type $Type -Daily -RetentionPolicies $r -BackupTime $BackupTime
73+
$protectionPolicy = New-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName -Type $Type -Daily -RetentionPolicy $r -BackupTime $BackupTime
7674

77-
Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
7875
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
7976
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
8077
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
@@ -86,16 +83,16 @@ function Test-NewAzureBackupProtectionPolicyTests
8683

8784
function Test-SetAzureBackupProtectionPolicyTests
8885
{
89-
$vault = Get-AzureBackupVault -Name $ResourceName;
86+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
9087
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
91-
$policyNewName = "policy09_new"
88+
$policyNewName = "policy09-new"
9289

9390
Set-AzureRMBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -NewName $policyNewName
9491
}
9592

9693
function Test-RemoveAzureBackupProtectionPolicyTests
9794
{
98-
$vault = Get-AzureBackupVault -Name $ResourceName;
95+
$vault = Get-AzureRMBackupVault -Name $ResourceName;
9996
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
10097

10198
Remove-AzureRMBackupProtectionPolicy -ProtectionPolicy $protectionPolicy

0 commit comments

Comments
 (0)