Skip to content

Commit fb008b4

Browse files
author
dragonfly91
committed
commit post merge
2 parents ee37157 + 6f6a9d7 commit fb008b4

File tree

10 files changed

+229
-303
lines changed

10 files changed

+229
-303
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@
8080
<Reference Include="Microsoft.WindowsAzure.Management">
8181
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8282
</Reference>
83+
<Reference Include="Microsoft.WindowsAzure.Management.BackupServicesManagment">
84+
<HintPath>..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\bin\Net45-Release\Microsoft.WindowsAzure.Management.BackupServicesManagment.dll</HintPath>
85+
</Reference>
8386
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8487
<SpecificVersion>False</SpecificVersion>
8588
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
@@ -125,10 +128,6 @@
125128
<Compile Include="Properties\AssemblyInfo.cs" />
126129
</ItemGroup>
127130
<ItemGroup>
128-
<ProjectReference Include="..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\BackupServicesManagment.csproj">
129-
<Project>{38a6741c-77a3-42a8-a846-83373be57c7f}</Project>
130-
<Name>BackupServicesManagment</Name>
131-
</ProjectReference>
132131
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
133132
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
134133
<Name>Commands.Common</Name>
@@ -153,13 +152,12 @@
153152
<SubType>Designer</SubType>
154153
</None>
155154
<None Include="ScenarioTests\AzureBackupTests.ps1">
156-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
155+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
157156
</None>
158157
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\BackUpAzureBackUpItem.json" />
159-
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\EnableDisableAzureBackupProtectionTest.json" />
160-
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\GetAzureBackupContainerTests.json" />
158+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\DisableAzureBackupProtectionTest.json" />
159+
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\EnableAzureBackupProtectionTest.json" />
161160
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\GetAzureBackupJobTests.json" />
162-
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\GetAzureBackupVaultCredentialsTests.json" />
163161
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\GetRecoveryPointTests.json" />
164162
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\ListAzureBackupItemTests.json" />
165163
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests\ListProtectionPolicyTests.json">

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,19 @@ public void ListProtectionPolicyTests()
2828
[Fact]
2929
public void ListAzureBackupItemTests()
3030
{
31-
this.RunPowerShellTest("Test-GetAzureBackupItemTests");
31+
this.RunPowerShellTest("Test-GetAzureBackupItem");
3232
}
3333

3434
[Fact]
35-
public void EnableDisableAzureBackupProtectionTest()
35+
public void EnableAzureBackupProtectionTest()
3636
{
37-
this.RunPowerShellTest("Test-EnableDisableAzureBackupProtectionTest");
37+
this.RunPowerShellTest("Test-EnableAzureBackupProtection");
38+
}
39+
40+
[Fact]
41+
public void DisableAzureBackupProtectionTest()
42+
{
43+
this.RunPowerShellTest("Test-DisableAzureBackupProtection");
3844
}
3945

4046
[Fact]

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

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,27 @@ function GetAzureRecoveryPointTest
5757
$azureBackUpItem.ContainerType = $ContainerType
5858
$azureBackUpItem.DataSourceId = $DataSourceId
5959
$azureBackUpItem.Type = $DataSourceType
60-
$recoveryPoints = Get-AzureBackupRecoveryPoint -item $azureBackUpItem
60+
$recoveryPoints = Get-AzureBackupRecoveryPoint -Item $azureBackUpItem
6161
if (!($recoveryPoints -eq $null))
6262
{
63-
foreach($recoveryPoint in $recoveryPoints)
64-
{
65-
Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'
66-
Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'
67-
Assert-NotNull $recoveryPoint.RecoveryPointId 'RecoveryPointId should not be null'
63+
foreach($recoveryPoint in $recoveryPoints)
64+
{
65+
Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'
66+
Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'
67+
Assert-NotNull $recoveryPoint.RecoveryPointId 'RecoveryPointId should not be null'
68+
}
6869
}
6970
}
7071

71-
function Test-GetAzureBackupItemTests
72+
function Test-GetAzureBackupItem
7273
{
7374
$azureBackUpContainer = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupContainer
7475
$azureBackUpContainer.ResourceGroupName = $ResourceGroupName
7576
$azureBackUpContainer.ResourceName = $ResourceName
7677
$azureBackUpContainer.Location = $Location
7778
$azureBackUpContainer.ContainerUniqueName = $ContainerName
7879
$azureBackUpContainer.ContainerType = $ContainerType
79-
$item = Get-AzureBackupItem -container $azureBackUpContainer
80+
$item = Get-AzureBackupItem -Container $azureBackUpContainer
8081
if (!($item -eq $null))
8182
{
8283
foreach($backupitem in $item)
@@ -85,15 +86,15 @@ function Test-GetAzureBackupItemTests
8586
Assert-NotNull $backupitem.Name 'Name should not be null'
8687
Assert-NotNull $backupitem.Type 'Type should not be null'
8788
Assert-NotNull $backupitem.ContainerType 'ContainerType should not be null'
88-
Assert-NotNull $backupitem.ContainerUniqueName 'ContainerUniqueName should not be null'
89-
Assert-NotNull $backupitem.ResourceGroupName 'ResourceGroupName should not be null'
90-
Assert-NotNull $backupitem.ResourceName 'ResourceName should not be null'
91-
Assert-NotNull $backupitem.Location 'Location should not be null'
89+
Assert-NotNull $backupitem.ContainerUniqueName 'ContainerUniqueName should not be null'
90+
Assert-NotNull $backupitem.ResourceGroupName 'ResourceGroupName should not be null'
91+
Assert-NotNull $backupitem.ResourceName 'ResourceName should not be null'
92+
Assert-NotNull $backupitem.Location 'Location should not be null'
9293
}
9394
}
9495
}
9596

96-
function Test-EnableDisableAzureBackupProtectionTest
97+
function Test-EnableAzureBackupProtection
9798
{
9899
$policy = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupProtectionPolicy
99100
$policy.InstanceId = $PolicyId
@@ -114,13 +115,22 @@ function Test-EnableDisableAzureBackupProtectionTest
114115
$azureBackUpItem.DataSourceId = $DataSourceId
115116
$azureBackUpItem.Type = $DataSourceType
116117
$azureBackUpItem.Name = $POName
117-
118-
$jobId = Enable-AzureBackupProtection -item $azureBackUpItem -Policy $policy
119-
sleep(20)
120-
$jobId1 = Disable-AzureBackupProtection -item $azureBackUpItem
121-
sleep(20)
122-
$jobId2 = Enable-AzureBackupProtection -item $azureBackUpItem -Policy $policy
118+
$jobId = Enable-AzureBackupProtection -Item $azureBackUpItem -Policy $policy
119+
123120
}
121+
122+
function Test-DisableAzureBackupProtection
123+
{
124+
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupItem
125+
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
126+
$azureBackUpItem.ResourceName = $ResourceName
127+
$azureBackUpItem.Location = $Location
128+
$azureBackUpItem.ContainerUniqueName = $ContainerName
129+
$azureBackUpItem.ContainerType = $ContainerType
130+
$azureBackUpItem.DataSourceId = $DataSourceId
131+
$azureBackUpItem.Type = $DataSourceType
132+
$azureBackUpItem.Name = $POName
133+
$jobId1 = Disable-AzureBackupProtection -Item $azureBackUpItem
124134
}
125135

126136
function BackUpAzureBackUpItemTest
@@ -133,7 +143,7 @@ function BackUpAzureBackUpItemTest
133143
$azureBackUpItem.ContainerType = $ContainerType
134144
$azureBackUpItem.DataSourceId = $DataSourceId
135145
$azureBackUpItem.Type = $DataSourceType
136-
$jobId = Backup-AzureBackupItem -item $azureBackUpItem
146+
$jobId = Backup-AzureBackupItem -Item $azureBackUpItem
137147
}
138148

139149

@@ -220,4 +230,4 @@ function Test-SetAzureBackupVaultStorageTypeWithLockedResourceThrowsException
220230
Assert-Throws { Set-AzureBackupVaultStorageType -ResourceGroupName $ResourceGroupName -ResourceName $ResourceName -Location $Location -Type GeoRedundant }
221231

222232
Assert-Throws { Set-AzureBackupVaultStorageType -ResourceGroupName $ResourceGroupName -ResourceName $ResourceName -Location $Location -Type LocallyRedundant }
223-
}
233+
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupTests/DisableAzureBackupProtectionTest.json

Lines changed: 75 additions & 0 deletions
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": "\"2fa60bcf-b87e-4fbf-b1dd-0003ece38f40\"",
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+
"18e31f54-88cd-43e8-969f-0b1cd783cf1f"
38+
],
39+
"x-ms-client-request-id": [
40+
"5ec97812-7689-447c-8218-ffd9841835d9",
41+
"5ec97812-7689-447c-8218-ffd9841835d9"
42+
],
43+
"Strict-Transport-Security": [
44+
"max-age=31536000; includeSubDomains"
45+
],
46+
"x-ms-ratelimit-remaining-subscription-writes": [
47+
"1193"
48+
],
49+
"x-ms-correlation-request-id": [
50+
"18e31f54-88cd-43e8-969f-0b1cd783cf1f"
51+
],
52+
"x-ms-routing-request-id": [
53+
"CENTRALUS:20150617T085657Z:18e31f54-88cd-43e8-969f-0b1cd783cf1f"
54+
],
55+
"Cache-Control": [
56+
"no-cache"
57+
],
58+
"Date": [
59+
"Wed, 17 Jun 2015 08:56:56 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.AzureBackupTests/EnableAzureBackupProtectionTest.json

Lines changed: 75 additions & 0 deletions
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": "\"a9bab2af-4d9b-40a9-ad02-c5d20973aa52\"",
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+
"31de0e3d-4909-482b-80e1-b3957f16569e"
38+
],
39+
"x-ms-client-request-id": [
40+
"2b2f4905-23d0-44a9-876b-3d6e8e7ca9c2",
41+
"2b2f4905-23d0-44a9-876b-3d6e8e7ca9c2"
42+
],
43+
"Strict-Transport-Security": [
44+
"max-age=31536000; includeSubDomains"
45+
],
46+
"x-ms-ratelimit-remaining-subscription-writes": [
47+
"1192"
48+
],
49+
"x-ms-correlation-request-id": [
50+
"31de0e3d-4909-482b-80e1-b3957f16569e"
51+
],
52+
"x-ms-routing-request-id": [
53+
"CENTRALUS:20150617T085435Z:31de0e3d-4909-482b-80e1-b3957f16569e"
54+
],
55+
"Cache-Control": [
56+
"no-cache"
57+
],
58+
"Date": [
59+
"Wed, 17 Jun 2015 08:54:35 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+
}

0 commit comments

Comments
 (0)