Skip to content

Commit 1e48be0

Browse files
swatimadhukargitswatimadhukargit
committed
Merge pull request #116 from MabOneSdk/dev1
FI from dev1 into release
2 parents e40c016 + 51e302b commit 1e48be0

File tree

25 files changed

+116
-809
lines changed

25 files changed

+116
-809
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16-
using System;
17-
using System.Collections.Generic;
18-
using System.Configuration;
19-
using System.Linq;
20-
using System.Text;
21-
using System.Threading.Tasks;
2216
using Xunit;
2317

2418
namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,21 @@ namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2020
public class AzureBackupItemTestCases : AzureBackupTestsBase
2121
{
2222
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2324
public void ListAzureBackupItemTests()
2425
{
2526
this.RunPowerShellTest("Test-GetAzureBackupItemTests");
2627
}
2728

2829
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2931
public void EnableAzureBackupProtectionTest()
3032
{
3133
this.RunPowerShellTest("Test-EnableAzureBackupProtection");
3234
}
3335

3436
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3538
public void DisableAzureBackupProtectionTest()
3639
{
3740
this.RunPowerShellTest("Test-DisableAzureBackupProtection");

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
$ResourceGroupName = "backuprg"
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
$ResourceGroupName = "backuprg"
216
$ResourceName = "backuprn"
317
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
418
$ContainerType = "IaasVMContainer"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ public class AzureBackupJobTests : AzureBackupTestsBase
2121
{
2222

2323
[Fact]
24+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2425
public void GetAzureRMBackupJobTests()
2526
{
2627
this.RunPowerShellTest("Test-GetAzureRMBackupJob");
2728
}
2829

2930
[Fact]
31+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3032
public void StopAzureRMBackupJobTests()
3133
{
3234
this.RunPowerShellTest("Test-StopAzureRMBackupJob");

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
$ResourceGroupName = "backuprg"
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
$ResourceGroupName = "backuprg"
216
$ResourceName = "backuprn"
317
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
418
$ContainerType = "IaasVMContainer"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,35 @@ namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2020
public class AzureBackupPolicyTests : AzureBackupTestsBase
2121
{
2222
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2324
public void ListProtectionPolicyTests()
2425
{
2526
this.RunPowerShellTest("Test-GetAzureBackupProtectionPolicyTests");
2627
}
2728

2829
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2931
public void NewProtectionPolicyTests()
3032
{
3133
this.RunPowerShellTest("Test-NewAzureBackupProtectionPolicyTests");
3234
}
3335

3436
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3538
public void ListProtectionPolicyByNameTests()
3639
{
3740
this.RunPowerShellTest("Test-GetAzureBackupProtectionPolicyByNameTests");
3841
}
3942

4043
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4145
public void SetProtectionPolicyTests()
4246
{
4347
this.RunPowerShellTest("Test-SetAzureBackupProtectionPolicyTests");
4448
}
4549

4650
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4752
public void RemoveProtectionPolicyTests()
4853
{
4954
this.RunPowerShellTest("Test-RemoveAzureBackupProtectionPolicyTests");

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using System.Collections.Generic;
17-
using System.Linq;
18-
using System.Text;
19-
using System.Threading.Tasks;
15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2016
using Xunit;
2117

2218
namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2319
{
2420
public class AzureBackupScenarioTests : AzureBackupTestsBase
2521
{
2622
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2724
public void AzureBackupEndToEndTests()
2825
{
2926
//this.RunPowerShellTest("Test-AzureBackupEndToEnd");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Test-AzureBackupEndToEnd
6969
Assert-AreEqual $item.DataSourceStatus "IRPending";
7070
Assert-AreEqual $item.ProtectionPolicyName $ProtectionPolicyName;
7171
Assert-AreEqual $item.ContainerType "AzureVM";
72-
Assert-AreEqual $item.Type "IaasVM";
72+
Assert-NotNull $item.Type;
7373
Assert-AreEqual $item.ItemName.Contains("iaasvmcontainer") "True";
7474
Assert-AreEqual $item.ItemName.Contains($VirtualMachineName) "True";
7575
Assert-AreEqual $item.ResourceGroupName $ResourceGroupName;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2020
public class BackupItemTests : AzureBackupTestsBase
2121
{
2222
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2324
public void BackUpAzureBackUpItem()
2425
{
2526
this.RunPowerShellTest("Test-BackUpAzureBackUpItem");

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
$ResourceGroupName = "backuprg"
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
$ResourceGroupName = "backuprg"
216
$ResourceName = "backuprn"
317
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
418
$ContainerType = "IaasVMContainer"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2020
public class RecoveryPointTests : AzureBackupTestsBase
2121
{
2222
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2324
public void GetRecoveryPointsTests()
2425
{
2526
this.RunPowerShellTest("Test-GetAzureRecoveryPoints");
2627
}
2728

2829
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2931
public void GetRecoveryPointTests()
3032
{
3133
this.RunPowerShellTest("Test-GetAzureRecoveryPoint");

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
$ResourceGroupName = "backuprg"
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
$ResourceGroupName = "backuprg"
216
$ResourceName = "backuprn"
317
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
418
$ContainerType = "IaasVMContainer"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
2020
public class RestoreItemTests : AzureBackupTestsBase
2121
{
2222
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2324
public void RestoreAzureBackUpItem()
2425
{
2526
this.RunPowerShellTest("Test-RestoreAzureBackUpItem");

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
$ResourceGroupName = "backuprg"
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
$ResourceGroupName = "backuprg"
216
$ResourceName = "backuprn"
317
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
418
$ContainerType = "IaasVMContainer"

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

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -70,70 +70,6 @@
7070
},
7171
"StatusCode": 202
7272
},
73-
{
74-
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/cd4690ce-0636-4bbc-91f1-df314f9f0369?api-version=2014-09-01",
75-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvY2Q0NjkwY2UtMDYzNi00YmJjLTkxZjEtZGYzMTRmOWYwMzY5P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
76-
"RequestMethod": "GET",
77-
"RequestBody": "",
78-
"RequestHeaders": {
79-
"Accept-Language": [
80-
"en-us"
81-
],
82-
"x-ms-client-request-id": [
83-
"d809fbd4-6915-48f1-8803-e0992fafd33d-2015-08-14 11:05:44Z-PS"
84-
],
85-
"User-Agent": [
86-
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
87-
]
88-
},
89-
"ResponseBody": "{\r\n \"status\": \"InProgress\",\r\n \"error\": {\r\n \"code\": \"\",\r\n \"message\": \"\"\r\n },\r\n \"jobList\": [\r\n \"f0e97977-1d36-4c5c-b20e-a83ca4a9a126\"\r\n ]\r\n}",
90-
"ResponseHeaders": {
91-
"Content-Length": [
92-
"107"
93-
],
94-
"Content-Type": [
95-
"application/json"
96-
],
97-
"Expires": [
98-
"-1"
99-
],
100-
"Pragma": [
101-
"no-cache"
102-
],
103-
"x-ms-request-id": [
104-
"3f657b12-2c70-4543-9a48-ed1ece38521e"
105-
],
106-
"x-ms-client-request-id": [
107-
"d809fbd4-6915-48f1-8803-e0992fafd33d-2015-08-14 11:05:44Z-PS",
108-
"d809fbd4-6915-48f1-8803-e0992fafd33d-2015-08-14 11:05:44Z-PS"
109-
],
110-
"Strict-Transport-Security": [
111-
"max-age=31536000; includeSubDomains"
112-
],
113-
"x-ms-ratelimit-remaining-subscription-reads": [
114-
"14986"
115-
],
116-
"x-ms-correlation-request-id": [
117-
"3f657b12-2c70-4543-9a48-ed1ece38521e"
118-
],
119-
"x-ms-routing-request-id": [
120-
"CENTRALUS:20150814T110548Z:3f657b12-2c70-4543-9a48-ed1ece38521e"
121-
],
122-
"Cache-Control": [
123-
"no-cache"
124-
],
125-
"Date": [
126-
"Fri, 14 Aug 2015 11:05:48 GMT"
127-
],
128-
"Server": [
129-
"Microsoft-IIS/8.0"
130-
],
131-
"X-Powered-By": [
132-
"ASP.NET"
133-
]
134-
},
135-
"StatusCode": 200
136-
},
13773
{
13874
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/cd4690ce-0636-4bbc-91f1-df314f9f0369?api-version=2014-09-01",
13975
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvY2Q0NjkwY2UtMDYzNi00YmJjLTkxZjEtZGYzMTRmOWYwMzY5P2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",

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

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -249,70 +249,6 @@
249249
},
250250
"StatusCode": 202
251251
},
252-
{
253-
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/2a2498dd-7916-46ae-b11c-7f9a59eb4e1f?api-version=2014-09-01",
254-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvMmEyNDk4ZGQtNzkxNi00NmFlLWIxMWMtN2Y5YTU5ZWI0ZTFmP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
255-
"RequestMethod": "GET",
256-
"RequestBody": "",
257-
"RequestHeaders": {
258-
"Accept-Language": [
259-
"en-us"
260-
],
261-
"x-ms-client-request-id": [
262-
"b9685770-7ee2-414c-8abf-24b363538c40-2015-08-14 09:44:51Z-PS"
263-
],
264-
"User-Agent": [
265-
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
266-
]
267-
},
268-
"ResponseBody": "{\r\n \"status\": \"InProgress\",\r\n \"error\": {\r\n \"code\": \"\",\r\n \"message\": \"\"\r\n },\r\n \"jobList\": [\r\n \"a9a103da-2f6c-41c9-8462-f4627facdddc\"\r\n ]\r\n}",
269-
"ResponseHeaders": {
270-
"Content-Length": [
271-
"107"
272-
],
273-
"Content-Type": [
274-
"application/json"
275-
],
276-
"Expires": [
277-
"-1"
278-
],
279-
"Pragma": [
280-
"no-cache"
281-
],
282-
"x-ms-request-id": [
283-
"25c3fad4-c1ea-4e74-a5c8-901161d56d75"
284-
],
285-
"x-ms-client-request-id": [
286-
"b9685770-7ee2-414c-8abf-24b363538c40-2015-08-14 09:44:51Z-PS",
287-
"b9685770-7ee2-414c-8abf-24b363538c40-2015-08-14 09:44:51Z-PS"
288-
],
289-
"Strict-Transport-Security": [
290-
"max-age=31536000; includeSubDomains"
291-
],
292-
"x-ms-ratelimit-remaining-subscription-reads": [
293-
"14992"
294-
],
295-
"x-ms-correlation-request-id": [
296-
"25c3fad4-c1ea-4e74-a5c8-901161d56d75"
297-
],
298-
"x-ms-routing-request-id": [
299-
"CENTRALUS:20150814T094453Z:25c3fad4-c1ea-4e74-a5c8-901161d56d75"
300-
],
301-
"Cache-Control": [
302-
"no-cache"
303-
],
304-
"Date": [
305-
"Fri, 14 Aug 2015 09:44:53 GMT"
306-
],
307-
"Server": [
308-
"Microsoft-IIS/8.0"
309-
],
310-
"X-Powered-By": [
311-
"ASP.NET"
312-
]
313-
},
314-
"StatusCode": 200
315-
},
316252
{
317253
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/operationResults/2a2498dd-7916-46ae-b11c-7f9a59eb4e1f?api-version=2014-09-01",
318254
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL29wZXJhdGlvblJlc3VsdHMvMmEyNDk4ZGQtNzkxNi00NmFlLWIxMWMtN2Y5YTU5ZWI0ZTFmP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",

0 commit comments

Comments
 (0)