Skip to content

Commit 2a5fcea

Browse files
AditTulasiAditTulasi
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents a424069 + 2f1d561 commit 2a5fcea

36 files changed

+213
-158
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class AzureBackupScenarioTests : AzureBackupTestsBase
2626
[Fact]
2727
public void AzureBackupEndToEndTests()
2828
{
29-
this.RunPowerShellTest("Test-AzureBackupEndToEnd");
29+
//this.RunPowerShellTest("Test-AzureBackupEndToEnd");
3030
}
3131
}
3232
}

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,18 @@ public abstract class AzureBackupTestsBase
3131
private CSMTestEnvironmentFactory csmTestFactory;
3232
private EnvironmentSetupHelper helper;
3333

34+
public static string ResourceGroupName;
35+
public static string ResourceName;
36+
3437
public BackupVaultServicesManagementClient BackupVaultServicesMgmtClient { get; private set; }
3538

3639
public BackupServicesManagementClient BackupServicesMgmtClient { get; private set; }
3740

3841
protected AzureBackupTestsBase()
3942
{
43+
AzureBackupTestsBase.ResourceName = ConfigurationManager.AppSettings["ResourceName"];
44+
AzureBackupTestsBase.ResourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];
45+
4046
this.helper = new EnvironmentSetupHelper();
4147
this.csmTestFactory = new CSMTestEnvironmentFactory();
4248
}
@@ -83,27 +89,20 @@ public static T GetServiceClient<T>() where T : class
8389

8490
ServicePointManager.ServerCertificateValidationCallback = IgnoreCertificateErrorHandler;
8591

86-
string resourceName = ConfigurationManager.AppSettings["ResourceName"];
87-
string resourceGroupName = ConfigurationManager.AppSettings["ResourceGroupName"];
88-
8992
if (typeof(T) == typeof(BackupVaultServicesManagementClient))
9093
{
9194
BackupVaultServicesManagementClient client;
9295

9396
if (testEnvironment.UsesCustomUri())
9497
{
9598
client = new BackupVaultServicesManagementClient(
96-
resourceName,
97-
resourceGroupName,
9899
testEnvironment.Credentials as SubscriptionCloudCredentials,
99100
testEnvironment.BaseUri);
100101
}
101102

102103
else
103104
{
104105
client = new BackupVaultServicesManagementClient(
105-
resourceName,
106-
resourceGroupName,
107106
testEnvironment.Credentials as SubscriptionCloudCredentials);
108107
}
109108

@@ -116,17 +115,13 @@ public static T GetServiceClient<T>() where T : class
116115
if (testEnvironment.UsesCustomUri())
117116
{
118117
client = new BackupServicesManagementClient(
119-
resourceName,
120-
resourceGroupName,
121118
testEnvironment.Credentials as SubscriptionCloudCredentials,
122119
testEnvironment.BaseUri);
123120
}
124121

125122
else
126123
{
127124
client = new BackupServicesManagementClient(
128-
resourceName,
129-
resourceGroupName,
130125
testEnvironment.Credentials as SubscriptionCloudCredentials);
131126
}
132127

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/AzureBackupClientAdapter.cs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ public partial class AzureBackupClientAdapter
3333
/// </summary>
3434
private Uri baseURI { get; set; }
3535

36-
/// <summary>
37-
/// ResourceGroup context for the operation
38-
/// </summary>
39-
private string resourceGroupName { get; set; }
40-
41-
/// <summary>
42-
/// Resource context for the operation
43-
/// </summary>
44-
private string resourceName { get; set; }
45-
4636
/// <summary>
4737
/// Client request id.
4838
/// </summary>
@@ -73,7 +63,7 @@ private BackupVaultServicesManagementClient AzureBackupVaultClient
7363
{
7464
if (this.azureBackupVaultClient == null)
7565
{
76-
this.azureBackupVaultClient = AzureSession.ClientFactory.CreateCustomClient<BackupVaultServicesManagementClient>(resourceName, resourceGroupName, cloudCreds, baseURI);
66+
this.azureBackupVaultClient = AzureSession.ClientFactory.CreateCustomClient<BackupVaultServicesManagementClient>(cloudCreds, baseURI);
7767
}
7868

7969
return this.azureBackupVaultClient;
@@ -89,19 +79,17 @@ private BackupServicesManagementClient AzureBackupClient
8979
{
9080
if (this.azureBackupClient == null)
9181
{
92-
this.azureBackupClient = AzureSession.ClientFactory.CreateCustomClient<BackupServicesManagementClient>(resourceName, resourceGroupName, cloudCreds, baseURI);
82+
this.azureBackupClient = AzureSession.ClientFactory.CreateCustomClient<BackupServicesManagementClient>(cloudCreds, baseURI);
9383
}
9484

9585
return this.azureBackupClient;
9686
}
9787
}
9888

99-
public AzureBackupClientAdapter(SubscriptionCloudCredentials creds, Uri baseUri, string rgName, string rName)
89+
public AzureBackupClientAdapter(SubscriptionCloudCredentials creds, Uri baseUri)
10090
{
10191
cloudCreds = creds;
10292
baseURI = baseUri;
103-
resourceGroupName = rgName;
104-
resourceName = rName;
10593

10694
RefreshClientRequestId();
10795

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/ContainerAdapter.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public partial class AzureBackupClientAdapter
3737
/// Gets all MARS containers in the vault
3838
/// </summary>
3939
/// <returns></returns>
40-
public IEnumerable<MarsContainerResponse> ListMachineContainers()
40+
public IEnumerable<MarsContainerResponse> ListMachineContainers(string resourceGroupName, string resourceName)
4141
{
42-
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByType(MarsContainerType.Machine, GetCustomRequestHeaders());
42+
var listResponse = AzureBackupVaultClient.Container.ListMarsContainersByType(resourceGroupName, resourceName, MarsContainerType.Machine, GetCustomRequestHeaders());
4343
return listResponse.ListMarsContainerResponse.Value;
4444
}
4545

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

@@ -59,17 +59,17 @@ public IEnumerable<MarsContainerResponse> ListMachineContainers(string friendlyN
5959
/// </summary>
6060
/// <param name="containerId"></param>
6161
/// <returns></returns>
62-
public void UnregisterMachineContainer(long containerId)
62+
public void UnregisterMachineContainer(string resourceGroupName, string resourceName, long containerId)
6363
{
64-
AzureBackupVaultClient.Container.UnregisterMarsContainer(containerId.ToString(), GetCustomRequestHeaders());
64+
AzureBackupVaultClient.Container.UnregisterMarsContainer(resourceGroupName, resourceName, containerId.ToString(), GetCustomRequestHeaders());
6565
}
6666

6767
/// <summary>
6868
/// Enable container reregistration
6969
/// </summary>
7070
/// <param name="containerId"></param>
7171
/// <returns></returns>
72-
public void EnableMachineContainerReregistration(long containerId)
72+
public void EnableMachineContainerReregistration(string resourceGroupName, string resourceName, long containerId)
7373
{
7474
EnableReregistrationRequest request = new EnableReregistrationRequest()
7575
{
@@ -79,17 +79,17 @@ public void EnableMachineContainerReregistration(long containerId)
7979
},
8080
};
8181

82-
AzureBackupVaultClient.Container.EnableMarsContainerReregistration(containerId.ToString(), request, GetCustomRequestHeaders());
82+
AzureBackupVaultClient.Container.EnableMarsContainerReregistration(resourceGroupName, resourceName, containerId.ToString(), request, GetCustomRequestHeaders());
8383
}
8484

8585
/// <summary>
8686
/// Gets all IaaSVM containers in the vault by friendly name
8787
/// </summary>
8888
/// <param name="parameters"></param>
8989
/// <returns></returns>
90-
public IEnumerable<CSMContainerResponse> ListContainers(ContainerQueryParameters parameters)
90+
public IEnumerable<CSMContainerResponse> ListContainers(string resourceGroupName, string resourceName, ContainerQueryParameters parameters)
9191
{
92-
var listResponse = AzureBackupClient.Container.ListAsync(parameters, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
92+
var listResponse = AzureBackupClient.Container.ListAsync(resourceGroupName, resourceName, parameters, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
9393
return listResponse.CSMContainerListResponse.Value;
9494
}
9595

@@ -98,9 +98,9 @@ public IEnumerable<CSMContainerResponse> ListContainers(ContainerQueryParameters
9898
/// </summary>
9999
/// <param name="containerName"></param>
100100
/// <returns></returns>
101-
public Guid RegisterContainer(string containerName)
101+
public Guid RegisterContainer(string resourceGroupName, string resourceName, string containerName)
102102
{
103-
var response = AzureBackupClient.Container.RegisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
103+
var response = AzureBackupClient.Container.RegisterAsync(resourceGroupName, resourceName, containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
104104
return response.OperationId;
105105
}
106106

@@ -109,19 +109,19 @@ public Guid RegisterContainer(string containerName)
109109
/// </summary>
110110
/// <param name="containerName"></param>
111111
/// <returns></returns>
112-
public Guid UnRegisterContainer(string containerName)
112+
public Guid UnRegisterContainer(string resourceGroupName, string resourceName, string containerName)
113113
{
114-
var response = AzureBackupClient.Container.UnregisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
114+
var response = AzureBackupClient.Container.UnregisterAsync(resourceGroupName, resourceName, containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
115115
return response.OperationId;
116116
}
117117

118118
/// <summary>
119119
/// Refresh container list in service
120120
/// </summary>
121121
/// <returns></returns>
122-
public Guid RefreshContainers()
122+
public Guid RefreshContainers(string resourceGroupName, string resourceName)
123123
{
124-
var response = AzureBackupClient.Container.RefreshAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
124+
var response = AzureBackupClient.Container.RefreshAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
125125
return response.OperationId;
126126
}
127127
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/ItemAdapter.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public partial class AzureBackupClientAdapter
3636
/// </summary>
3737
/// <param name="query"></param>
3838
/// <returns></returns>
39-
public IList<CSMProtectedItemResponse> ListDataSources(CSMProtectedItemQueryObject query)
39+
public IList<CSMProtectedItemResponse> ListDataSources(string resourceGroupName, string resourceName, CSMProtectedItemQueryObject query)
4040
{
41-
var response = AzureBackupClient.DataSource.ListCSMAsync(query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
41+
var response = AzureBackupClient.DataSource.ListCSMAsync(resourceGroupName, resourceName, query, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
4242
return (response != null) ? response.CSMProtectedItemListResponse.Value : null;
4343
}
4444

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

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

@@ -72,9 +72,9 @@ public Guid DisableProtection(string containerName, string itemName)
7272
/// </summary>
7373
/// <param name="request"></param>
7474
/// <returns></returns>
75-
public Guid EnableProtection(string containerName, string itemName, CSMSetProtectionRequest request)
75+
public Guid EnableProtection(string resourceGroupName, string resourceName, string containerName, string itemName, CSMSetProtectionRequest request)
7676
{
77-
var response = AzureBackupClient.DataSource.EnableProtectionCSMAsync(GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
77+
var response = AzureBackupClient.DataSource.EnableProtectionCSMAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
7878
return response.OperationId;
7979
}
8080

@@ -83,9 +83,9 @@ public Guid EnableProtection(string containerName, string itemName, CSMSetProtec
8383
/// </summary>
8484
/// <param name="request"></param>
8585
/// <returns></returns>
86-
public Guid UpdateProtection(string containerName, string itemName, CSMUpdateProtectionRequest request)
86+
public Guid UpdateProtection(string resourceGroupName, string resourceName, string containerName, string itemName, CSMUpdateProtectionRequest request)
8787
{
88-
var response = AzureBackupClient.DataSource.UpdateProtectionCSMAsync(GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
88+
var response = AzureBackupClient.DataSource.UpdateProtectionCSMAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, request, CmdletCancellationToken).Result;
8989
return response.OperationId;
9090
}
9191

@@ -95,9 +95,9 @@ public Guid UpdateProtection(string containerName, string itemName, CSMUpdatePro
9595
/// <param name="containerName"></param>
9696
/// <param name="itemName"></param>
9797
/// <returns></returns>
98-
public Guid TriggerBackup(string containerName, string itemName)
98+
public Guid TriggerBackup(string resourceGroupName, string resourceName, string containerName, string itemName)
9999
{
100-
var response = AzureBackupClient.BackUp.TriggerBackUpAsync(GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
100+
var response = AzureBackupClient.BackUp.TriggerBackUpAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, CmdletCancellationToken).Result;
101101
return response.OperationId;
102102
}
103103

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

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

@@ -132,9 +132,9 @@ public CSMRecoveryPointResponse GetRecoveryPoint(string containerName, string it
132132
/// <param name="itemName"></param>
133133
/// <param name="recoveryPointName"></param>
134134
/// <returns></returns>
135-
public Guid TriggerRestore(string containerName, string itemName, string recoveryPointName, CSMRestoreRequest csmRestoreRequest)
135+
public Guid TriggerRestore(string resourceGroupName, string resourceName, string containerName, string itemName, string recoveryPointName, CSMRestoreRequest csmRestoreRequest)
136136
{
137-
var response = AzureBackupClient.Restore.TriggerResotreAsync(GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, csmRestoreRequest, CmdletCancellationToken).Result;
137+
var response = AzureBackupClient.Restore.TriggerResotreAsync(resourceGroupName, resourceName, GetCustomRequestHeaders(), containerName, itemName, recoveryPointName, csmRestoreRequest, CmdletCancellationToken).Result;
138138
return response.OperationId;
139139
}
140140
}

0 commit comments

Comments
 (0)