Skip to content

Csm master newclient #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AditTulasi merged 2 commits into from
Aug 17, 2015
Merged

Csm master newclient #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1bba2
Updating client and operations in all test functions
AditTulasi Aug 17, 2015
0efb71c
Fixing test cases etc after updating hydra
AditTulasi Aug 17, 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
2 changes: 1 addition & 1 deletion src/ResourceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/BackUpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void TriggerBackUpTest()
string containerName = ConfigurationManager.AppSettings["ContainerName"];
string itemName = ConfigurationManager.AppSettings["ItemName"];

var response = client.BackUp.TriggerBackUp(GetCustomRequestHeaders(), containerName, itemName);
var response = client.BackUp.TriggerBackUp(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, GetCustomRequestHeaders(), containerName, itemName);
Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
}
}
Expand Down
20 changes: 9 additions & 11 deletions ...sourceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/BackupServicesTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,34 @@ 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;

string resourceName = ConfigurationManager.AppSettings["ResourceName"];
string resourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];

if (typeof(T) == typeof(BackupServicesManagementClient))
{
BackupServicesManagementClient client;
if (testEnvironment.UsesCustomUri())
{
client = new BackupServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials,
testEnvironment.BaseUri);
}
else
{
client = new BackupServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials);
}

Expand All @@ -66,16 +68,12 @@ public class BackupServicesTestsBase : TestBase
if (testEnvironment.UsesCustomUri())
{
client = new BackupVaultServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials,
testEnvironment.BaseUri);
}
else
{
client = new BackupVaultServicesManagementClient(
resourceName,
resourceGroupName,
testEnvironment.Credentials as SubscriptionCloudCredentials);
}

Expand Down
22 changes: 14 additions & 8 deletions src/ResourceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/CSMAzureBackupItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@ public void EnableAzureBackupProtectionTest()
{
using (UndoContext context = UndoContext.Current)
{
var client = GetServiceClient<BackupServicesManagementClient>();
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();
CSMSetProtectionRequest input = new CSMSetProtectionRequest();
input.Properties = new CSMSetProtectionRequestProperties();
input.Properties.PolicyId = ConfigurationManager.AppSettings["PolicyId"];
string itemName = ConfigurationManager.AppSettings["AzureBackupItemName"];
string containerName = ConfigurationManager.AppSettings["ContainerName"];

var response = client.DataSource.EnableProtectionCSM(GetCustomRequestHeaders(),
var response = client.DataSource.EnableProtectionCSM(BackupServicesTestsBase.ResourceGroupName,
BackupServicesTestsBase.ResourceName,
GetCustomRequestHeaders(),
containerName,
itemName,
input);
Expand All @@ -57,16 +59,18 @@ public void UpdateAzureBackupProtectionTest()
{
using (UndoContext context = UndoContext.Current)
{
var client = GetServiceClient<BackupServicesManagementClient>();
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();

CSMUpdateProtectionRequest input = new CSMUpdateProtectionRequest();
input.Properties = new CSMUpdateProtectionRequestProperties();
string itemName = ConfigurationManager.AppSettings["AzureBackupItemName"];
string containerName = ConfigurationManager.AppSettings["ContainerName"];
input.Properties.PolicyId = string.Empty;

var response = client.DataSource.UpdateProtectionCSM(GetCustomRequestHeaders(),
var response = client.DataSource.UpdateProtectionCSM(BackupServicesTestsBase.ResourceGroupName,
BackupServicesTestsBase.ResourceName,
GetCustomRequestHeaders(),
containerName,
itemName,
input);
Expand All @@ -80,12 +84,14 @@ public void DisableAzureBackupProtectionTest()
{
using (UndoContext context = UndoContext.Current)
{
var client = GetServiceClient<BackupServicesManagementClient>();
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();

string itemName = ConfigurationManager.AppSettings["AzureBackupItemName"];
string containerName = ConfigurationManager.AppSettings["ContainerName"];
var response = client.DataSource.DisableProtectionCSM(GetCustomRequestHeaders(),
var response = client.DataSource.DisableProtectionCSM(BackupServicesTestsBase.ResourceGroupName,
BackupServicesTestsBase.ResourceName,
GetCustomRequestHeaders(),
containerName,
itemName);

Expand All @@ -108,7 +114,7 @@ public void ListAzureBackupItemPOTest()

var client = GetServiceClient<BackupServicesManagementClient>();

var response = client.ProtectableObject.ListCSMAsync(POQueryParam, GetCustomRequestHeaders()).Result;
var response = client.ProtectableObject.ListCSMAsync(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, POQueryParam, GetCustomRequestHeaders()).Result;

Assert.True(response.CSMItemListResponse.Value.Count > 0, "Protectable Object Result count can't be less than 1");

Expand Down Expand Up @@ -142,7 +148,7 @@ public void ListAzureBackupItemDSTest()

var client = GetServiceClient<BackupServicesManagementClient>();

var response = client.DataSource.ListCSMAsync(DSQueryParam, GetCustomRequestHeaders()).Result;
var response = client.DataSource.ListCSMAsync(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, DSQueryParam, GetCustomRequestHeaders()).Result;
foreach (var ds in response.CSMProtectedItemListResponse.Value)
{
Assert.True(!string.IsNullOrEmpty(ds.Properties.ContainerId), "ContainerId can't be null or empty");
Expand Down
8 changes: 4 additions & 4 deletions ...urceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/CSMProtectionPolicyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void ListProtectionPolicyTest()
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();

var response = client.CSMProtectionPolicy.List(GetCustomRequestHeaders());
var response = client.CSMProtectionPolicy.List(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, GetCustomRequestHeaders());

Assert.True(response.CSMProtectionPolicyListResponse.Value.Count > 0, "Protection Policies Result count can't be less than 1");

Expand Down Expand Up @@ -62,7 +62,7 @@ public void AddProtectionPolicyTest()
addProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
addProtectionPolicyRequest.Properties.WorkloadType = ConfigurationManager.AppSettings["WorkloadType"];
addProtectionPolicyRequest.Properties.LtrRetentionPolicy = GetRetentionPolicy(backupSchedule.ScheduleRunTimes);
var response = client.CSMProtectionPolicy.Add(policyName, addProtectionPolicyRequest, GetCustomRequestHeaders());
var response = client.CSMProtectionPolicy.Add(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, policyName, addProtectionPolicyRequest, GetCustomRequestHeaders());

Assert.Equal(HttpStatusCode.OK, response.StatusCode);
}
Expand All @@ -83,7 +83,7 @@ public void UpdateProtectionPolicyTest()
string policyName = ConfigurationManager.AppSettings["PolicyName"];
updateProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
updateProtectionPolicyRequest.Properties.LtrRetentionPolicy = GetRetentionPolicy(backupSchedule.ScheduleRunTimes);
var response = client.CSMProtectionPolicy.Update(policyName, updateProtectionPolicyRequest, GetCustomRequestHeaders());
var response = client.CSMProtectionPolicy.Update(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, policyName, updateProtectionPolicyRequest, GetCustomRequestHeaders());
var isSuccess = (response.StatusCode == HttpStatusCode.OK || response.StatusCode == HttpStatusCode.Accepted) ? true : false;
Assert.Equal(true, isSuccess);
}
Expand All @@ -97,7 +97,7 @@ public void DeleteProtectionPolicyTest()
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();
string policyName = ConfigurationManager.AppSettings["ModifiedPolicyName"];
var response = client.CSMProtectionPolicy.Delete(policyName, GetCustomRequestHeaders());
var response = client.CSMProtectionPolicy.Delete(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, policyName, GetCustomRequestHeaders());

Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
}
Expand Down
30 changes: 15 additions & 15 deletions src/ResourceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/ContainerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public void RegisterContainerTest()
{
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();

string containerName = ConfigurationManager.AppSettings["ContainerName2"];
var response = client.Container.Register(containerName, GetCustomRequestHeaders());
var response = client.Container.Register(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, containerName, GetCustomRequestHeaders());
Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
}
}
Expand All @@ -53,7 +53,7 @@ public void UnregisterContainerTest()
var client = GetServiceClient<BackupServicesManagementClient>();

string containerName = ConfigurationManager.AppSettings["ContainerName2"];
var response = client.Container.Unregister(containerName, GetCustomRequestHeaders());
var response = client.Container.Unregister(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, containerName, GetCustomRequestHeaders());
Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
}
}
Expand All @@ -67,7 +67,7 @@ public void RefreshContainerTest()
var client = GetServiceClient<BackupServicesManagementClient>();

string containerName = ConfigurationManager.AppSettings["ContainerName"];
var response = client.Container.Refresh(GetCustomRequestHeaders());
var response = client.Container.Refresh(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, GetCustomRequestHeaders());
Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
}
}
Expand All @@ -90,7 +90,7 @@ void ListMarsContainersByTypeReturnsNonZeroContainers()
string friendlyName = ConfigurationManager.AppSettings["ContainerFriendlyName"];
string uniqueName = ConfigurationManager.AppSettings["ContainerUniqueName"];

ListMarsContainerOperationResponse response = client.Container.ListMarsContainersByType(MarsContainerType.Machine, GetCustomRequestHeaders());
ListMarsContainerOperationResponse response = client.Container.ListMarsContainersByType(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, MarsContainerType.Machine, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down Expand Up @@ -130,7 +130,7 @@ void ListMarsContainersByTypeAndFriendlyNameReturnsSameContainer()
string friendlyName = ConfigurationManager.AppSettings["ContainerFriendlyName"];
string uniqueName = ConfigurationManager.AppSettings["ContainerUniqueName"];

ListMarsContainerOperationResponse response = client.Container.ListMarsContainersByTypeAndFriendlyName(MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
ListMarsContainerOperationResponse response = client.Container.ListMarsContainersByTypeAndFriendlyName(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down Expand Up @@ -163,15 +163,15 @@ void UnregisterContainerDeletesContainer()
string containerId = ConfigurationManager.AppSettings["ContainerId"];
string friendlyName = ConfigurationManager.AppSettings["ContainerFriendlyName"];

OperationResponse response = client.Container.UnregisterMarsContainer(containerId, GetCustomRequestHeaders());
OperationResponse response = client.Container.UnregisterMarsContainer(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, containerId, GetCustomRequestHeaders());
// Response Validation
Assert.NotNull(response);
Assert.True(response.StatusCode == HttpStatusCode.NoContent, "Status code should be NoContent");

bool containerDeleted = false;
try
{
ListMarsContainerOperationResponse getResponse = client.Container.ListMarsContainersByTypeAndFriendlyName(MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
ListMarsContainerOperationResponse getResponse = client.Container.ListMarsContainersByTypeAndFriendlyName(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
if (getResponse.ListMarsContainerResponse.Value.Count == 0)
{
containerDeleted = true;
Expand Down Expand Up @@ -215,13 +215,13 @@ void EnableContainerReregistrationSetsReregisterFlag()
},
};

OperationResponse response = client.Container.EnableMarsContainerReregistration(containerId, request, GetCustomRequestHeaders());
OperationResponse response = client.Container.EnableMarsContainerReregistration(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, containerId, request, GetCustomRequestHeaders());
// Response Validation
Assert.NotNull(response);
Assert.True(response.StatusCode == HttpStatusCode.NoContent, "Status code should be NoContent");

// Basic Validation
ListMarsContainerOperationResponse getResponse = client.Container.ListMarsContainersByTypeAndFriendlyName(MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
ListMarsContainerOperationResponse getResponse = client.Container.ListMarsContainersByTypeAndFriendlyName(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
Assert.True(getResponse.ListMarsContainerResponse.Value.Any(marsContainer =>
{
return marsContainer.ContainerType == MarsContainerType.Machine.ToString() &&
Expand Down Expand Up @@ -249,7 +249,7 @@ void ListContainersReturnsNonZeroContainers()
string containerHealthStatus = ConfigurationManager.AppSettings["BMSContainerHealthStatus"];
string containerParentId = ConfigurationManager.AppSettings["BMSParentContainerIdPanbha45"];

CSMContainerListOperationResponse response = client.Container.List(null, GetCustomRequestHeaders());
CSMContainerListOperationResponse response = client.Container.List(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, null, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down Expand Up @@ -290,8 +290,8 @@ void ListContainersByFriendlyNameReturnsValidResponse()

ContainerQueryParameters parameters = new ContainerQueryParameters();
parameters.FriendlyName = friendlyName;
CSMContainerListOperationResponse response = client.Container.List(parameters, GetCustomRequestHeaders());

CSMContainerListOperationResponse response = client.Container.List(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, parameters, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down Expand Up @@ -334,7 +334,7 @@ void ListContainersByStatusReturnsValidResponse()
parameters.ContainerType = containerType;
parameters.Status = containerStatus;

CSMContainerListOperationResponse response = client.Container.List(parameters, GetCustomRequestHeaders());
CSMContainerListOperationResponse response = client.Container.List(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, parameters, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down Expand Up @@ -378,7 +378,7 @@ void ListContainersByFriendlyNameAndStatusReturnsValidResponse()
parameters.FriendlyName = friendlyName;
parameters.Status = containerStatus;

CSMContainerListOperationResponse response = client.Container.List(parameters, GetCustomRequestHeaders());
CSMContainerListOperationResponse response = client.Container.List(BackupServicesTestsBase.ResourceGroupName, BackupServicesTestsBase.ResourceName, parameters, GetCustomRequestHeaders());

// Response Validation
Assert.NotNull(response);
Expand Down
Loading