Skip to content

Updating powershell code and tests after hydra update #113

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
merged 1 commit into from
Aug 17, 2015
Merged

Updating powershell code and tests after hydra update #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions ...esourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,18 @@ public abstract class AzureBackupTestsBase
private CSMTestEnvironmentFactory csmTestFactory;
private EnvironmentSetupHelper helper;

public static string ResourceGroupName;
public static string ResourceName;

public BackupVaultServicesManagementClient BackupVaultServicesMgmtClient { get; private set; }

public BackupServicesManagementClient BackupServicesMgmtClient { get; private set; }

protected AzureBackupTestsBase()
{
AzureBackupTestsBase.ResourceName = ConfigurationManager.AppSettings["ResourceName"];
AzureBackupTestsBase.ResourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];

this.helper = new EnvironmentSetupHelper();
this.csmTestFactory = new CSMTestEnvironmentFactory();
}
Expand Down Expand Up @@ -83,27 +89,20 @@ public static T GetServiceClient<T>() where T : class

ServicePointManager.ServerCertificateValidationCallback = IgnoreCertificateErrorHandler;

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

if (typeof(T) == typeof(BackupVaultServicesManagementClient))
{
BackupVaultServicesManagementClient client;

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 All @@ -116,17 +115,13 @@ public static T GetServiceClient<T>() where T : class
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 Down
18 changes: 3 additions & 15 deletions ...ger/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/AzureBackupClientAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@ public partial class AzureBackupClientAdapter
/// </summary>
private Uri baseURI { get; set; }

/// <summary>
/// ResourceGroup context for the operation
/// </summary>
private string resourceGroupName { get; set; }

/// <summary>
/// Resource context for the operation
/// </summary>
private string resourceName { get; set; }

/// <summary>
/// Client request id.
/// </summary>
Expand Down Expand Up @@ -73,7 +63,7 @@ private BackupVaultServicesManagementClient AzureBackupVaultClient
{
if (this.azureBackupVaultClient == null)
{
this.azureBackupVaultClient = AzureSession.ClientFactory.CreateCustomClient<BackupVaultServicesManagementClient>(resourceName, resourceGroupName, cloudCreds, baseURI);
this.azureBackupVaultClient = AzureSession.ClientFactory.CreateCustomClient<BackupVaultServicesManagementClient>(cloudCreds, baseURI);
}

return this.azureBackupVaultClient;
Expand All @@ -89,19 +79,17 @@ private BackupServicesManagementClient AzureBackupClient
{
if (this.azureBackupClient == null)
{
this.azureBackupClient = AzureSession.ClientFactory.CreateCustomClient<BackupServicesManagementClient>(resourceName, resourceGroupName, cloudCreds, baseURI);
this.azureBackupClient = AzureSession.ClientFactory.CreateCustomClient<BackupServicesManagementClient>(cloudCreds, baseURI);
}

return this.azureBackupClient;
}
}

public AzureBackupClientAdapter(SubscriptionCloudCredentials creds, Uri baseUri, string rgName, string rName)
public AzureBackupClientAdapter(SubscriptionCloudCredentials creds, Uri baseUri)
{
cloudCreds = creds;
baseURI = baseUri;
resourceGroupName = rgName;
resourceName = rName;

RefreshClientRequestId();

Expand Down
32 changes: 16 additions & 16 deletions ...urceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/ContainerAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public partial class AzureBackupClientAdapter
/// Gets all MARS containers in the vault
/// </summary>
/// <returns></returns>
public IEnumerable<MarsContainerResponse> ListMachineContainers()
public IEnumerable<MarsContainerResponse> ListMachineContainers(string resourceGroupName, string resourceName)
{
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByType(MarsContainerType.Machine, GetCustomRequestHeaders());
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByType(resourceGroupName, resourceName, MarsContainerType.Machine, GetCustomRequestHeaders());
return listResponse.ListMarsContainerResponse.Value;
}

Expand All @@ -48,9 +48,9 @@ public IEnumerable<MarsContainerResponse> ListMachineContainers()
/// </summary>
/// <param name="friendlyName">The friendly name of the container</param>
/// <returns></returns>
public IEnumerable<MarsContainerResponse> ListMachineContainers(string friendlyName)
public IEnumerable<MarsContainerResponse> ListMachineContainers(string resourceGroupName, string resourceName, string friendlyName)
{
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByTypeAndFriendlyName(MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByTypeAndFriendlyName(resourceGroupName, resourceName, MarsContainerType.Machine, friendlyName, GetCustomRequestHeaders());
return listResponse.ListMarsContainerResponse.Value;
}

Expand All @@ -59,17 +59,17 @@ public IEnumerable<MarsContainerResponse> ListMachineContainers(string friendlyN
/// </summary>
/// <param name="containerId"></param>
/// <returns></returns>
public void UnregisterMachineContainer(long containerId)
public void UnregisterMachineContainer(string resourceGroupName, string resourceName, long containerId)
{
AzureBackupVaultClient.Container.UnregisterMarsContainer(containerId.ToString(), GetCustomRequestHeaders());
AzureBackupVaultClient.Container.UnregisterMarsContainer(resourceGroupName, resourceName, containerId.ToString(), GetCustomRequestHeaders());
}

/// <summary>
/// Enable container reregistration
/// </summary>
/// <param name="containerId"></param>
/// <returns></returns>
public void EnableMachineContainerReregistration(long containerId)
public void EnableMachineContainerReregistration(string resourceGroupName, string resourceName, long containerId)
{
EnableReregistrationRequest request = new EnableReregistrationRequest()
{
Expand All @@ -79,17 +79,17 @@ public void EnableMachineContainerReregistration(long containerId)
},
};

AzureBackupVaultClient.Container.EnableMarsContainerReregistration(containerId.ToString(), request, GetCustomRequestHeaders());
AzureBackupVaultClient.Container.EnableMarsContainerReregistration(resourceGroupName, resourceName, containerId.ToString(), request, GetCustomRequestHeaders());
}

/// <summary>
/// Gets all IaaSVM containers in the vault by friendly name
/// </summary>
/// <param name="parameters"></param>
/// <returns></returns>
public IEnumerable<CSMContainerResponse> ListContainers(ContainerQueryParameters parameters)
public IEnumerable<CSMContainerResponse> ListContainers(string resourceGroupName, string resourceName, ContainerQueryParameters parameters)
{
var listResponse = AzureBackupClient.Container.ListAsync(parameters, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var listResponse = AzureBackupClient.Container.ListAsync(resourceGroupName, resourceName, parameters, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return listResponse.CSMContainerListResponse.Value;
}

Expand All @@ -98,9 +98,9 @@ public IEnumerable<CSMContainerResponse> ListContainers(ContainerQueryParameters
/// </summary>
/// <param name="containerName"></param>
/// <returns></returns>
public Guid RegisterContainer(string containerName)
public Guid RegisterContainer(string resourceGroupName, string resourceName, string containerName)
{
var response = AzureBackupClient.Container.RegisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var response = AzureBackupClient.Container.RegisterAsync(resourceGroupName, resourceName, containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return response.OperationId;
}

Expand All @@ -109,19 +109,19 @@ public Guid RegisterContainer(string containerName)
/// </summary>
/// <param name="containerName"></param>
/// <returns></returns>
public Guid UnRegisterContainer(string containerName)
public Guid UnRegisterContainer(string resourceGroupName, string resourceName, string containerName)
{
var response = AzureBackupClient.Container.UnregisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var response = AzureBackupClient.Container.UnregisterAsync(resourceGroupName, resourceName, containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return response.OperationId;
}

/// <summary>
/// Refresh container list in service
/// </summary>
/// <returns></returns>
public Guid RefreshContainers()
public Guid RefreshContainers(string resourceGroupName, string resourceName)
{
var response = AzureBackupClient.Container.RefreshAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var response = AzureBackupClient.Container.RefreshAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return response.OperationId;
}
}
Expand Down
36 changes: 18 additions & 18 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/ItemAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public partial class AzureBackupClientAdapter
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public IList<CSMProtectedItemResponse> ListDataSources(CSMProtectedItemQueryObject query)
public IList<CSMProtectedItemResponse> ListDataSources(string resourceGroupName, string resourceName, CSMProtectedItemQueryObject query)
{
var response = AzureBackupClient.DataSource.ListCSMAsync(query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var response = AzureBackupClient.DataSource.ListCSMAsync(resourceGroupName, resourceName, query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return (response != null) ? response.CSMProtectedItemListResponse.Value : null;
}

Expand All @@ -47,9 +47,9 @@ public IList<CSMProtectedItemResponse> ListDataSources(CSMProtectedItemQueryObje
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public IList<CSMItemResponse> ListProtectableObjects(CSMItemQueryObject query)
public IList<CSMItemResponse> ListProtectableObjects(string resourceGroupName, string resourceName, CSMItemQueryObject query)
{
var response = AzureBackupClient.ProtectableObject.ListCSMAsync(query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
var response = AzureBackupClient.ProtectableObject.ListCSMAsync(resourceGroupName, resourceName, query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
return (response != null) ? response.CSMItemListResponse.Value : null;
}

Expand All @@ -61,9 +61,9 @@ public IList<CSMItemResponse> ListProtectableObjects(CSMItemQueryObject query)
/// <param name="dsId"></param>
/// <param name="request"></param>
/// <returns></returns>
public Guid DisableProtection(string containerName, string itemName)
public Guid DisableProtection(string resourceGroupName, string resourceName, string containerName, string itemName)
{
var response = AzureBackupClient.DataSource.DisableProtectionCSMAsync(GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
var response = AzureBackupClient.DataSource.DisableProtectionCSMAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
return response.OperationId;
}

Expand All @@ -72,9 +72,9 @@ public Guid DisableProtection(string containerName, string itemName)
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public Guid EnableProtection(string containerName, string itemName, CSMSetProtectionRequest request)
public Guid EnableProtection(string resourceGroupName, string resourceName, string containerName, string itemName, CSMSetProtectionRequest request)
{
var response = AzureBackupClient.DataSource.EnableProtectionCSMAsync(GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
var response = AzureBackupClient.DataSource.EnableProtectionCSMAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
return response.OperationId;
}

Expand All @@ -83,9 +83,9 @@ public Guid EnableProtection(string containerName, string itemName, CSMSetProtec
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public Guid UpdateProtection(string containerName, string itemName, CSMUpdateProtectionRequest request)
public Guid UpdateProtection(string resourceGroupName, string resourceName, string containerName, string itemName, CSMUpdateProtectionRequest request)
{
var response = AzureBackupClient.DataSource.UpdateProtectionCSMAsync(GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
var response = AzureBackupClient.DataSource.UpdateProtectionCSMAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
return response.OperationId;
}

Expand All @@ -95,9 +95,9 @@ public Guid UpdateProtection(string containerName, string itemName, CSMUpdatePro
/// <param name="containerName"></param>
/// <param name="itemName"></param>
/// <returns></returns>
public Guid TriggerBackup(string containerName, string itemName)
public Guid TriggerBackup(string resourceGroupName, string resourceName, string containerName, string itemName)
{
var response = AzureBackupClient.BackUp.TriggerBackUpAsync(GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
var response = AzureBackupClient.BackUp.TriggerBackUpAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
return response.OperationId;
}

Expand All @@ -107,9 +107,9 @@ public Guid TriggerBackup(string containerName, string itemName)
/// <param name="containerName"></param>
/// <param name="itemName"></param>
/// <returns></returns>
public IEnumerable<CSMRecoveryPointResponse> ListRecoveryPoints(string containerName, string itemName)
public IEnumerable<CSMRecoveryPointResponse> ListRecoveryPoints(string resourceGroupName, string resourceName, string containerName, string itemName)
{
var response = AzureBackupClient.RecoveryPoint.ListAsync(GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
var response = AzureBackupClient.RecoveryPoint.ListAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
return (response != null) ? response.CSMRecoveryPointListResponse.Value : null;
}

Expand All @@ -119,9 +119,9 @@ public IEnumerable<CSMRecoveryPointResponse> ListRecoveryPoints(string container
/// <param name="containerName"></param>
/// <param name="itemName"></param>
/// <returns></returns>
public CSMRecoveryPointResponse GetRecoveryPoint(string containerName, string itemName, string recoveryPointName)
public CSMRecoveryPointResponse GetRecoveryPoint(string resourceGroupName, string resourceName, string containerName, string itemName, string recoveryPointName)
{
var response = AzureBackupClient.RecoveryPoint.GetAsync(GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, CmdletCancellationToken).Result;
var response = AzureBackupClient.RecoveryPoint.GetAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, CmdletCancellationToken).Result;
return (response != null) ? response.CSMRecoveryPointResponse : null;
}

Expand All @@ -132,9 +132,9 @@ public CSMRecoveryPointResponse GetRecoveryPoint(string containerName, string it
/// <param name="itemName"></param>
/// <param name="recoveryPointName"></param>
/// <returns></returns>
public Guid TriggerRestore(string containerName, string itemName, string recoveryPointName, CSMRestoreRequest csmRestoreRequest)
public Guid TriggerRestore(string resourceGroupName, string resourceName, string containerName, string itemName, string recoveryPointName, CSMRestoreRequest csmRestoreRequest)
{
var response = AzureBackupClient.Restore.TriggerResotreAsync(GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, csmRestoreRequest, CmdletCancellationToken).Result;
var response = AzureBackupClient.Restore.TriggerResotreAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, csmRestoreRequest, CmdletCancellationToken).Result;
return response.OperationId;
}
}
Expand Down
Loading