Skip to content

Commit 01f823f

Browse files
committed
Conflicts: src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.cs src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.ps1 src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases/EnableDisableAzureBackupProtectionTest.json src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases/ListAzureBackupItemTests.json
2 parents 0976619 + 6f6a9d7 commit 01f823f

File tree

11 files changed

+1041
-821
lines changed

11 files changed

+1041
-821
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@
170170
<None Include="ScenarioTests\RecoveryPointTests.ps1">
171171
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
172172
</None>
173-
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\EnableDisableAzureBackupProtectionTest.json" />
173+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\DisableAzureBackupProtectionTest.json" />
174+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\EnableAzureBackupProtectionTest.json" />
174175
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\ListAzureBackupItemTests.json" />
175176
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests\GetAzureBackupJobTests.json" />
176177
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\ListProtectionPolicyTests.json">

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupItemTestCases.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@ public void ListAzureBackupItemTests()
2626
}
2727

2828
[Fact]
29-
public void EnableDisableAzureBackupProtectionTest()
29+
public void EnableAzureBackupProtectionTest()
3030
{
31-
this.RunPowerShellTest("Test-EnableDisableAzureBackupProtectionTest");
31+
this.RunPowerShellTest("Test-EnableAzureBackupProtection");
32+
}
33+
34+
[Fact]
35+
public void DisableAzureBackupProtectionTest()
36+
{
37+
this.RunPowerShellTest("Test-DisableAzureBackupProtection");
3238
}
3339
}
3440
}

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function Test-GetAzureBackupItemTests
3535
}
3636
}
3737

38-
function Test-EnableDisableAzureBackupProtectionTest
38+
function Test-EnableAzureBackupProtection
3939
{
4040
$policy = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupProtectionPolicy
4141
$policy.InstanceId = $PolicyId
@@ -56,10 +56,20 @@ function Test-EnableDisableAzureBackupProtectionTest
5656
$azureBackUpItem.DataSourceId = $DataSourceId
5757
$azureBackUpItem.Type = $DataSourceType
5858
$azureBackUpItem.Name = $POName
59-
6059
$jobId = Enable-AzureBackupProtection -Item $azureBackUpItem -Policy $policy
61-
sleep(20)
60+
61+
}
62+
63+
function Test-DisableAzureBackupProtection
64+
{
65+
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupItem
66+
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
67+
$azureBackUpItem.ResourceName = $ResourceName
68+
$azureBackUpItem.Location = $Location
69+
$azureBackUpItem.ContainerUniqueName = $ContainerName
70+
$azureBackUpItem.ContainerType = $ContainerType
71+
$azureBackUpItem.DataSourceId = $DataSourceId
72+
$azureBackUpItem.Type = $DataSourceType
73+
$azureBackUpItem.Name = $POName
6274
$jobId1 = Disable-AzureBackupProtection -Item $azureBackUpItem
63-
sleep(20)
64-
$jobId2 = Enable-AzureBackupProtection -Item $azureBackUpItem -Policy $policy
65-
}
75+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"Entries": [
3+
{
4+
"RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backupseadev01/BackupVault/backuprn/containers/iaasvmcontainer%3Bdev01testing%3Bdev01testing/datasources/VM/17593283453810/unprotect?api-version=2014-09-01",
5+
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3Vwc2VhZGV2MDEvQmFja3VwVmF1bHQvYmFja3Vwcm4vY29udGFpbmVycy9pYWFzdm1jb250YWluZXIlM0JkZXYwMXRlc3RpbmclM0JkZXYwMXRlc3RpbmcvZGF0YXNvdXJjZXMvVk0vMTc1OTMyODM0NTM4MTAvdW5wcm90ZWN0P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
6+
"RequestMethod": "POST",
7+
"RequestBody": "{\r\n \"RemoveProtectionOption\": \"RetainBackupData\"\r\n}",
8+
"RequestHeaders": {
9+
"Content-Type": [
10+
"application/json"
11+
],
12+
"Content-Length": [
13+
"52"
14+
],
15+
"Accept-Language": [
16+
"en-us"
17+
],
18+
"User-Agent": [
19+
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
20+
]
21+
},
22+
"ResponseBody": "\"06575eda-d275-4b55-8fd8-85b2cd9b11cc\"",
23+
"ResponseHeaders": {
24+
"Content-Length": [
25+
"38"
26+
],
27+
"Content-Type": [
28+
"application/json"
29+
],
30+
"Expires": [
31+
"-1"
32+
],
33+
"Pragma": [
34+
"no-cache"
35+
],
36+
"x-ms-request-id": [
37+
"252852dc-4d4b-4b7f-b9c4-75501c686cfc"
38+
],
39+
"x-ms-client-request-id": [
40+
"e5a5bf75-c719-4d49-9ad9-25801095373a",
41+
"e5a5bf75-c719-4d49-9ad9-25801095373a"
42+
],
43+
"Strict-Transport-Security": [
44+
"max-age=31536000; includeSubDomains"
45+
],
46+
"x-ms-ratelimit-remaining-subscription-writes": [
47+
"1197"
48+
],
49+
"x-ms-correlation-request-id": [
50+
"252852dc-4d4b-4b7f-b9c4-75501c686cfc"
51+
],
52+
"x-ms-routing-request-id": [
53+
"CENTRALUS:20150617T093517Z:252852dc-4d4b-4b7f-b9c4-75501c686cfc"
54+
],
55+
"Cache-Control": [
56+
"no-cache"
57+
],
58+
"Date": [
59+
"Wed, 17 Jun 2015 09:35:17 GMT"
60+
],
61+
"Server": [
62+
"Microsoft-IIS/8.0"
63+
],
64+
"X-Powered-By": [
65+
"ASP.NET"
66+
]
67+
},
68+
"StatusCode": 202
69+
}
70+
],
71+
"Names": {},
72+
"Variables": {
73+
"SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
74+
}
75+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"Entries": [
3+
{
4+
"RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backupseadev01/BackupVault/backuprn/protectableobjects/protect?api-version=2014-09-01",
5+
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3Vwc2VhZGV2MDEvQmFja3VwVmF1bHQvYmFja3Vwcm4vcHJvdGVjdGFibGVvYmplY3RzL3Byb3RlY3Q/YXBpLXZlcnNpb249MjAxNC0wOS0wMQ==",
6+
"RequestMethod": "POST",
7+
"RequestBody": "{\r\n \"ProtectableObjects\": [\r\n \"iaasvmcontainer;dev01testing;dev01testing\"\r\n ],\r\n \"ProtectableObjectType\": \"VM\",\r\n \"PolicyId\": \"c87bbada-6e1b-4db2-b76c-9062d28959a4\"\r\n}",
8+
"RequestHeaders": {
9+
"Content-Type": [
10+
"application/json"
11+
],
12+
"Content-Length": [
13+
"174"
14+
],
15+
"Accept-Language": [
16+
"en-us"
17+
],
18+
"User-Agent": [
19+
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
20+
]
21+
},
22+
"ResponseBody": "\"736dee4d-3b5f-46b6-84a5-f3d1293af225\"",
23+
"ResponseHeaders": {
24+
"Content-Length": [
25+
"38"
26+
],
27+
"Content-Type": [
28+
"application/json"
29+
],
30+
"Expires": [
31+
"-1"
32+
],
33+
"Pragma": [
34+
"no-cache"
35+
],
36+
"x-ms-request-id": [
37+
"5c9542ef-4e72-47bb-85ac-d987fdce8a2a"
38+
],
39+
"x-ms-client-request-id": [
40+
"0e68c2bf-de3a-4a7f-993d-be2881fd4d6a",
41+
"0e68c2bf-de3a-4a7f-993d-be2881fd4d6a"
42+
],
43+
"Strict-Transport-Security": [
44+
"max-age=31536000; includeSubDomains"
45+
],
46+
"x-ms-ratelimit-remaining-subscription-writes": [
47+
"1195"
48+
],
49+
"x-ms-correlation-request-id": [
50+
"5c9542ef-4e72-47bb-85ac-d987fdce8a2a"
51+
],
52+
"x-ms-routing-request-id": [
53+
"CENTRALUS:20150617T093549Z:5c9542ef-4e72-47bb-85ac-d987fdce8a2a"
54+
],
55+
"Cache-Control": [
56+
"no-cache"
57+
],
58+
"Date": [
59+
"Wed, 17 Jun 2015 09:35:49 GMT"
60+
],
61+
"Server": [
62+
"Microsoft-IIS/8.0"
63+
],
64+
"X-Powered-By": [
65+
"ASP.NET"
66+
]
67+
},
68+
"StatusCode": 202
69+
}
70+
],
71+
"Names": {},
72+
"Variables": {
73+
"SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
74+
}
75+
}

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases/EnableDisableAzureBackupProtectionTest.json

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)