Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
ee4de5f
Adding hydra changes for other cmdlets part 1
Jul 7, 2015
4aba273
Adding hydra test cases
Jul 8, 2015
c82ea41
Removed ContainerInfo and depending only on CSMContainerResponse
Jul 8, 2015
6857479
Deleting the container info model files
Jul 8, 2015
f837a2c
FI from csp-artemis
Jul 13, 2015
35c3677
Deleting unwanted files
Jul 13, 2015
561354d
sdknetbackupandRestore
panbha Jul 15, 2015
7a9ee68
Merge pull request #36 from MabOneSdk/csm-panbha1
panbha Jul 15, 2015
26ca58e
recoverypoint1
panbha Jul 18, 2015
4c8ee62
recoverypoint3
panbha Jul 18, 2015
0d9acd5
Merge pull request #37 from MabOneSdk/csm-panbha1
panbha Jul 18, 2015
1465664
pikumarandmychanges
panbha Jul 21, 2015
7a5f6bb
Merge pull request #39 from MabOneSdk/csm-panbhacr
panbha Jul 21, 2015
3626db8
missedfiles
panbha Jul 22, 2015
c73a228
Merge pull request #40 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
a4b3acc
missedfiles1
panbha Jul 22, 2015
85e7612
Merge pull request #41 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
e6224a5
missedfiles2
panbha Jul 22, 2015
b691a62
Merge pull request #42 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
ea7d984
missedfile3
panbha Jul 22, 2015
b7573e3
Merge pull request #43 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
05b3490
recoverypointId
panbha Jul 22, 2015
b3f3f2f
Merge pull request #44 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
6d3191c
backupcamel
panbha Jul 22, 2015
7401f64
recoverycamel
panbha Jul 22, 2015
effb8a7
restorecamel
panbha Jul 22, 2015
f851a82
Merge pull request #45 from MabOneSdk/csm-panbhacr21
panbha Jul 22, 2015
12d0233
Adding Jobs tests file
AditTulasi Jul 23, 2015
8d13797
Merge branch 'csm-master' into csm-adit-branch
AditTulasi Jul 23, 2015
90c26fc
CSM Jobs changes
AditTulasi Jul 23, 2015
8897421
Merge pull request #46 from MabOneSdk/csm-adit-branch
AditTulasi Jul 23, 2015
5890fc8
rp1
panbha Jul 23, 2015
5509500
app
panbha Jul 23, 2015
3bb2bc9
Merge pull request #47 from MabOneSdk/csm-panbhacr21
panbha Jul 23, 2015
e3c58a0
LTR Changes
pragrawa Jul 24, 2015
281f051
Merge Conflict
pragrawa Jul 24, 2015
518374d
Merge Conflict
pragrawa Jul 24, 2015
76743d9
Merge Conflict
pragrawa Jul 24, 2015
0ae05a9
Merge pull request #48 from MabOneSdk/csm-pragrawa
pragrawa Jul 24, 2015
8302653
Merge Conflict
pragrawa Jul 24, 2015
fd3398f
Merge pull request #49 from MabOneSdk/csm-pragrawa
pragrawa Jul 24, 2015
ab5297a
Policy Hydra Test
pragrawa Jul 24, 2015
eca5768
Merge Conflict
pragrawa Jul 24, 2015
af749ff
Merge pull request #50 from MabOneSdk/csm-pragrawa
pragrawa Jul 24, 2015
f543ab7
test cases
pikumarmsftnew16 Jul 27, 2015
aab279c
LTR Policy changes
pragrawa Jul 27, 2015
9ef967d
Merge pull request #51 from MabOneSdk/csm-pragrawa
pragrawa Jul 27, 2015
b7bfd47
Merge branch 'csm-master' of https://github.com/MabOneSdk/azure-sdk-f…
pikumarmsftnew16 Jul 31, 2015
b52422a
latest changes
pikumarmsftnew16 Jul 31, 2015
a4f6def
adding more files
pikumarmsftnew16 Jul 31, 2015
9a73ea6
Merge pull request #52 from MabOneSdk/csm-pikumar
pikumarmsftnew16 Jul 31, 2015
616682b
Adding container test cases
mkherani Aug 2, 2015
d31970b
Supporting dual clients
Aug 3, 2015
b1e14d6
Adding MARS Container and Get Container tests
Aug 3, 2015
936f5d6
Adding session records
Aug 3, 2015
085ce88
Adding session records
Aug 3, 2015
0cc03c4
Adding container tests + records
Aug 4, 2015
d48e493
changing type to itemType
pikumarmsftnew16 Aug 5, 2015
3090dfa
Merge pull request #53 from MabOneSdk/csm-pikumar
pikumarmsftnew16 Aug 5, 2015
667a47b
Fix for bug 3865084:[SDKBash2]: TaskId is not in correct format for C…
Aug 6, 2015
2f7083d
Fix for bug 3916852:[SDKBash2]: Client request ID is set in the respo…
Aug 6, 2015
626ee17
Fixing jobs test cases
AditTulasi Aug 13, 2015
3150829
hydra recording with csm changes
pikumarmsftnew16 Aug 14, 2015
cdcd4ca
Merge pull request #54 from MabOneSdk/csm-pikumar
pikumarmsftnew16 Aug 14, 2015
18d2cbb
Merge from release and taking target files
swatimadhukargit Aug 14, 2015
89a5ded
Generating code from Hyak specs for AzureBackup
swatimadhukargit Aug 14, 2015
56894d4
Fixing failing test cases
swatimadhukargit Aug 15, 2015
1aee963
Merge branch 'release' into csm-master
swatimadhukargit Aug 15, 2015
a48e020
Fixing AzureBackup.sln and TestDependencies.csproj
swatimadhukargit Aug 15, 2015
2d1bba2
Updating client and operations in all test functions
AditTulasi Aug 17, 2015
18b5d72
Disabling failing test cases temporarily
swatimadhukargit Aug 17, 2015
0efb71c
Fixing test cases etc after updating hydra
AditTulasi Aug 17, 2015
7b8244c
Merge pull request #55 from MabOneSdk/csm-master-newclient
AditTulasi Aug 17, 2015
00e6000
Merge pull request #56 from MabOneSdk/csm-master
AditTulasi Aug 17, 2015
d03fa19
Removing locker folder which got added by mistake.
swatimadhukargit Aug 18, 2015
9e72a5a
Increase nuget package version
swatimadhukargit Aug 18, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@
<ItemGroup>
<Compile Include="Helpers\VaultTestHelper.cs" />
<Compile Include="ScenarioTests\BackupServicesTestBase.cs" />
<Compile Include="ScenarioTests\BackUpTests.cs" />
<Compile Include="ScenarioTests\CSMAzureBackupItem.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ScenarioTests\ContainerTests.cs" />
<Compile Include="ScenarioTests\VaultTests.cs" />
<Compile Include="ScenarioTests\JobsTests.cs" />
<Compile Include="ScenarioTests\CSMProtectionPolicyTests.cs" />
<Compile Include="ScenarioTests\RecoveryPointTests.cs" />
<Compile Include="ScenarioTests\RestoreTest.cs" />
<Compile Include="ScenarioTests\VaultTests.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.WindowsAzure.Management.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -40,18 +50,87 @@
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="SessionRecords\BackupServices.Tests.BackUpTests\TriggerBackUpTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\EnableContainerReregistrationSetsReregisterFlag.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameAndStatusReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByStatusReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersReturnsNonZeroContainers.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeAndFriendlyNameReturnsSameContainer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeReturnsNonZeroContainers.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\RefreshContainerTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\RegisterContainerTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\UnregisterContainerDeletesContainer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\UnregisterContainerTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\DisableAzureBackupProtectionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\EnableAzureBackupProtectionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\ListAzureBackupItemDSTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\ListAzureBackupItemPOTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\UpdateAzureBackupProtectionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.JobsTests\CancelJobTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.JobsTests\GetJobDetailsTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.JobsTests\ListGetJobsTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\AddProtectionPolicyTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\DeleteProtectionPolicyTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\ListProtectionPolicyTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\UpdateProtectionPolicyTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.RecoveryPointTests\GetRecoveryPointTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.RecoveryPointTests\ListRecoveryPointTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.RestoreTests\TriggerRestoreTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\CreateOrUpdateVaultReturnsValidCodeTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// Copyright (c) Microsoft. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

using Microsoft.Azure.Management.BackupServices.Models;
using Microsoft.Azure.Management.BackupServices;
using Microsoft.Azure.Test;
using System.Net;
using Xunit;
using System.Configuration;
using System;

namespace BackupServices.Tests
{
public class BackUpTests : BackupServicesTestsBase
{
[Fact]
public void TriggerBackUpTest()
{
using (UndoContext context = UndoContext.Current)
{
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();

string containerName = ConfigurationManager.AppSettings["ContainerName"];
string itemName = ConfigurationManager.AppSettings["ItemName"];

var response = client.BackUp.TriggerBackUp(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, GetCustomRequestHeaders(), containerName, itemName);
Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,97 @@ namespace BackupServices.Tests
{
public class BackupServicesTestsBase : TestBase
{
public static string ResourceGroupName;
public static string ResourceName;

public BackupServicesTestsBase()
{
BackupServicesTestsBase.ResourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];
BackupServicesTestsBase.ResourceName = ConfigurationManager.AppSettings["ResourceName"];
}

public new static T GetServiceClient<T>() where T : class
{
var factory = (TestEnvironmentFactory)new CSMTestEnvironmentFactory();

var testEnvironment = factory.GetTestEnvironment();
ServicePointManager.ServerCertificateValidationCallback = IgnoreCertificateErrorHandler;

BackupVaultServicesManagementClient client;

string resourceName = ConfigurationManager.AppSettings["ResourceName"];
string resourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];
if (testEnvironment.UsesCustomUri())
if (typeof(T) == typeof(BackupServicesManagementClient))
{
client = new BackupVaultServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials,
testEnvironment.BaseUri);
BackupServicesManagementClient client;
if (testEnvironment.UsesCustomUri())
{
client = new BackupServicesManagementClient(
testEnvironment.Credentials as SubscriptionCloudCredentials,
testEnvironment.BaseUri);
}
else
{
client = new BackupServicesManagementClient(
testEnvironment.Credentials as SubscriptionCloudCredentials);
}

return GetServiceClient<T>(factory, client);
}
else
{
client = new BackupVaultServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials);
}
BackupVaultServicesManagementClient client;
if (testEnvironment.UsesCustomUri())
{
client = new BackupVaultServicesManagementClient(
testEnvironment.Credentials as SubscriptionCloudCredentials,
testEnvironment.BaseUri);
}
else
{
client = new BackupVaultServicesManagementClient(
testEnvironment.Credentials as SubscriptionCloudCredentials);
}

return GetServiceClient<T>(factory, client);
return GetServiceClient<T>(factory, client);
}
}

public static T GetServiceClient<T>(TestEnvironmentFactory factory, BackupServicesManagementClient client) where T : class
{
TestEnvironment testEnvironment = factory.GetTestEnvironment();

HttpMockServer instance;
try
{
instance = HttpMockServer.CreateInstance();
}
catch (ApplicationException)
{
HttpMockServer.Initialize("TestEnvironment", "InitialCreation");
instance = HttpMockServer.CreateInstance();
}
T obj2 = typeof(T).GetMethod("WithHandler", new Type[1]
{
typeof (DelegatingHandler)
}).Invoke((object)client, new object[1]
{
(object) instance
}) as T;

if (HttpMockServer.Mode == HttpRecorderMode.Record)
{
HttpMockServer.Variables[TestEnvironment.SubscriptionIdKey] = testEnvironment.SubscriptionId;
}

if (HttpMockServer.Mode == HttpRecorderMode.Playback)
{
PropertyInfo property1 = typeof(T).GetProperty("LongRunningOperationInitialTimeout", typeof(int));
PropertyInfo property2 = typeof(T).GetProperty("LongRunningOperationRetryTimeout", typeof(int));
if (property1 != (PropertyInfo)null && property2 != (PropertyInfo)null)
{
property1.SetValue((object)obj2, (object)0);
property2.SetValue((object)obj2, (object)0);
}
}
return obj2;
}

public static T GetServiceClient<T>(TestEnvironmentFactory factory, BackupVaultServicesManagementClient client) where T : class
{
Expand Down
Loading