Skip to content

Commit 0f32396

Browse files
mkheranimkherani
committed
PR feedback: removing ProviderData class
1 parent e20de1d commit 0f32396

File tree

8 files changed

+54
-98
lines changed

8 files changed

+54
-98
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<Compile Include="Providers\DpmPsBackupProvider.cs" />
6262
<Compile Include="Providers\MabPsBackupProvider.cs" />
6363
<Compile Include="PsBackupProviderManager.cs" />
64-
<Compile Include="PsBackupProviderDC.cs" />
6564
<Compile Include="Providers\IaasVmPsBackupProvider.cs" />
6665
</ItemGroup>
6766
<ItemGroup>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2525
{
2626
public interface IPsBackupProvider
2727
{
28-
void Initialize(ProviderData providerData, HydraAdapter hydraAdapter);
28+
void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter);
2929

3030
BaseRecoveryServicesJobResponse EnableProtection();
3131

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2424
{
2525
public class AzureSqlPsBackupProvider : IPsBackupProvider
2626
{
27-
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
27+
public void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter)
2828
{
2929
throw new NotImplementedException();
3030
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2626
{
2727
public class DpmPsBackupProvider : IPsBackupProvider
2828
{
29-
ProviderData ProviderData { get; set; }
29+
Dictionary<System.Enum, object> ProviderData { get; set; }
3030
HydraAdapter HydraAdapter { get; set; }
3131

32-
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
32+
public void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter)
3333
{
3434
this.ProviderData = providerData;
3535
this.HydraAdapter = hydraAdapter;
@@ -87,7 +87,7 @@ public ProtectionPolicyResponse ModifyPolicy()
8787

8888
public List<Models.AzureRmRecoveryServicesBackupEngineBase> ListBackupManagementServers()
8989
{
90-
string name = (string)this.ProviderData.ProviderParameters[ContainerParams.Name];
90+
string name = (string)this.ProviderData[ContainerParams.Name];
9191

9292
BackupEngineListQueryParams queryParams = new BackupEngineListQueryParams();
9393

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,30 @@ public class IaasVmPsBackupProvider : IPsBackupProvider
3636
private const string computeAzureVMVersion = "Microsoft.Compute";
3737
private const string classicComputeAzureVMVersion = "Microsoft.ClassicCompute";
3838

39-
ProviderData ProviderData { get; set; }
39+
Dictionary<System.Enum, object> ProviderData { get; set; }
4040
HydraAdapter HydraAdapter { get; set; }
4141

42-
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
42+
public void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter)
4343
{
4444
this.ProviderData = providerData;
4545
this.HydraAdapter = hydraAdapter;
4646
}
4747

4848
public BaseRecoveryServicesJobResponse EnableProtection()
4949
{
50-
string azureVMName = (string)ProviderData.ProviderParameters[ItemParams.AzureVMName];
51-
string azureVMCloudServiceName = (string)ProviderData.ProviderParameters[ItemParams.AzureVMCloudServiceName];
52-
string azureVMResourceGroupName = (string)ProviderData.ProviderParameters[ItemParams.AzureVMResourceGroupName];
53-
string parameterSetName = (string)ProviderData.ProviderParameters[ItemParams.ParameterSetName];
50+
string azureVMName = (string)ProviderData[ItemParams.AzureVMName];
51+
string azureVMCloudServiceName = (string)ProviderData[ItemParams.AzureVMCloudServiceName];
52+
string azureVMResourceGroupName = (string)ProviderData[ItemParams.AzureVMResourceGroupName];
53+
string parameterSetName = (string)ProviderData[ItemParams.ParameterSetName];
5454

5555
AzureRmRecoveryServicesBackupPolicyBase policy = (AzureRmRecoveryServicesBackupPolicyBase)
56-
ProviderData.ProviderParameters[ItemParams.Policy];
56+
ProviderData[ItemParams.Policy];
5757

5858
AzureRmRecoveryServicesBackupItemBase itemBase = (AzureRmRecoveryServicesBackupItemBase)
59-
ProviderData.ProviderParameters[ItemParams.Item];
59+
ProviderData[ItemParams.Item];
6060

6161
AzureRmRecoveryServicesBackupIaasVmItem item = (AzureRmRecoveryServicesBackupIaasVmItem)
62-
ProviderData.ProviderParameters[ItemParams.Item];
62+
ProviderData[ItemParams.Item];
6363
// do validations
6464

6565
string containerUri = "";
@@ -122,13 +122,13 @@ public BaseRecoveryServicesJobResponse EnableProtection()
122122

123123
public BaseRecoveryServicesJobResponse DisableProtection()
124124
{
125-
bool deleteBackupData = (bool)ProviderData.ProviderParameters[ItemParams.DeleteBackupData];
125+
bool deleteBackupData = (bool)ProviderData[ItemParams.DeleteBackupData];
126126

127127
AzureRmRecoveryServicesBackupItemBase itemBase = (AzureRmRecoveryServicesBackupItemBase)
128-
ProviderData.ProviderParameters[ItemParams.Item];
128+
ProviderData[ItemParams.Item];
129129

130130
AzureRmRecoveryServicesBackupIaasVmItem item = (AzureRmRecoveryServicesBackupIaasVmItem)
131-
ProviderData.ProviderParameters[ItemParams.Item];
131+
ProviderData[ItemParams.Item];
132132
// do validations
133133

134134
ValidateAzureVMDisableProtectionRequest(itemBase);
@@ -181,19 +181,19 @@ public BaseRecoveryServicesJobResponse DisableProtection()
181181

182182
public BaseRecoveryServicesJobResponse TriggerBackup()
183183
{
184-
AzureRmRecoveryServicesBackupItemBase item = (AzureRmRecoveryServicesBackupItemBase)ProviderData.ProviderParameters[ItemParams.Item];
184+
AzureRmRecoveryServicesBackupItemBase item = (AzureRmRecoveryServicesBackupItemBase)ProviderData[ItemParams.Item];
185185
AzureRmRecoveryServicesBackupIaasVmItem iaasVmItem = item as AzureRmRecoveryServicesBackupIaasVmItem;
186186
return HydraAdapter.TriggerBackup(IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectionContainerName),
187187
IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectedItemName));
188188
}
189189

190190
public BaseRecoveryServicesJobResponse TriggerRestore()
191191
{
192-
AzureRmRecoveryServicesBackupIaasVmRecoveryPoint rp = ProviderData.ProviderParameters[RestoreBackupItemParams.RecoveryPoint]
192+
AzureRmRecoveryServicesBackupIaasVmRecoveryPoint rp = ProviderData[RestoreBackupItemParams.RecoveryPoint]
193193
as AzureRmRecoveryServicesBackupIaasVmRecoveryPoint;
194-
string storageAccountId = ProviderData.ProviderParameters[RestoreBackupItemParams.StorageAccountId].ToString();
195-
string storageAccountLocation = ProviderData.ProviderParameters[RestoreBackupItemParams.StorageAccountLocation].ToString();
196-
string storageAccountType = ProviderData.ProviderParameters[RestoreBackupItemParams.StorageAccountType].ToString();
194+
string storageAccountId = ProviderData[RestoreBackupItemParams.StorageAccountId].ToString();
195+
string storageAccountLocation = ProviderData[RestoreBackupItemParams.StorageAccountLocation].ToString();
196+
string storageAccountType = ProviderData[RestoreBackupItemParams.StorageAccountType].ToString();
197197

198198
var response = HydraAdapter.RestoreDisk(rp, storageAccountId, storageAccountLocation, storageAccountType);
199199
return response;
@@ -206,10 +206,10 @@ public ProtectedItemResponse GetProtectedItem()
206206

207207
public AzureRmRecoveryServicesBackupRecoveryPointBase GetRecoveryPointDetails()
208208
{
209-
AzureRmRecoveryServicesBackupIaasVmItem item = ProviderData.ProviderParameters[GetRecoveryPointParams.Item]
209+
AzureRmRecoveryServicesBackupIaasVmItem item = ProviderData[GetRecoveryPointParams.Item]
210210
as AzureRmRecoveryServicesBackupIaasVmItem;
211211

212-
string recoveryPointId = ProviderData.ProviderParameters[GetRecoveryPointParams.RecoveryPointId].ToString();
212+
string recoveryPointId = ProviderData[GetRecoveryPointParams.RecoveryPointId].ToString();
213213

214214
Dictionary<UriEnums, string> uriDict = HelperUtils.ParseUri(item.Id);
215215
string containerUri = HelperUtils.GetContainerUri(uriDict, item.Id);
@@ -221,9 +221,9 @@ public AzureRmRecoveryServicesBackupRecoveryPointBase GetRecoveryPointDetails()
221221

222222
public List<AzureRmRecoveryServicesBackupRecoveryPointBase> ListRecoveryPoints()
223223
{
224-
DateTime startDate = (DateTime)(ProviderData.ProviderParameters[GetRecoveryPointParams.StartDate]);
225-
DateTime endDate = (DateTime)(ProviderData.ProviderParameters[GetRecoveryPointParams.EndDate]);
226-
AzureRmRecoveryServicesBackupIaasVmItem item = ProviderData.ProviderParameters[GetRecoveryPointParams.Item]
224+
DateTime startDate = (DateTime)(ProviderData[GetRecoveryPointParams.StartDate]);
225+
DateTime endDate = (DateTime)(ProviderData[GetRecoveryPointParams.EndDate]);
226+
AzureRmRecoveryServicesBackupIaasVmItem item = ProviderData[GetRecoveryPointParams.Item]
227227
as AzureRmRecoveryServicesBackupIaasVmItem;
228228

229229
Dictionary<UriEnums, string> uriDict = HelperUtils.ParseUri(item.Id);
@@ -248,16 +248,16 @@ public List<AzureRmRecoveryServicesBackupRecoveryPointBase> ListRecoveryPoints()
248248

249249
public ProtectionPolicyResponse CreatePolicy()
250250
{
251-
string policyName = (string)ProviderData.ProviderParameters[PolicyParams.PolicyName];
251+
string policyName = (string)ProviderData[PolicyParams.PolicyName];
252252
Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType workloadType =
253-
(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];
253+
(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData[PolicyParams.WorkloadType];
254254
AzureRmRecoveryServicesBackupRetentionPolicyBase retentionPolicy =
255-
ProviderData.ProviderParameters.ContainsKey(PolicyParams.RetentionPolicy) ?
256-
(AzureRmRecoveryServicesBackupRetentionPolicyBase)ProviderData.ProviderParameters[PolicyParams.RetentionPolicy] :
255+
ProviderData.ContainsKey(PolicyParams.RetentionPolicy) ?
256+
(AzureRmRecoveryServicesBackupRetentionPolicyBase)ProviderData[PolicyParams.RetentionPolicy] :
257257
null;
258258
AzureRmRecoveryServicesBackupSchedulePolicyBase schedulePolicy =
259-
ProviderData.ProviderParameters.ContainsKey(PolicyParams.SchedulePolicy) ?
260-
(AzureRmRecoveryServicesBackupSchedulePolicyBase)ProviderData.ProviderParameters[PolicyParams.SchedulePolicy] :
259+
ProviderData.ContainsKey(PolicyParams.SchedulePolicy) ?
260+
(AzureRmRecoveryServicesBackupSchedulePolicyBase)ProviderData[PolicyParams.SchedulePolicy] :
261261
null;
262262

263263
// do validations
@@ -303,17 +303,17 @@ public ProtectionPolicyResponse CreatePolicy()
303303
public ProtectionPolicyResponse ModifyPolicy()
304304
{
305305
AzureRmRecoveryServicesBackupRetentionPolicyBase retentionPolicy =
306-
ProviderData.ProviderParameters.ContainsKey(PolicyParams.RetentionPolicy) ?
307-
(AzureRmRecoveryServicesBackupRetentionPolicyBase)ProviderData.ProviderParameters[PolicyParams.RetentionPolicy] :
306+
ProviderData.ContainsKey(PolicyParams.RetentionPolicy) ?
307+
(AzureRmRecoveryServicesBackupRetentionPolicyBase)ProviderData[PolicyParams.RetentionPolicy] :
308308
null;
309309
AzureRmRecoveryServicesBackupSchedulePolicyBase schedulePolicy =
310-
ProviderData.ProviderParameters.ContainsKey(PolicyParams.SchedulePolicy) ?
311-
(AzureRmRecoveryServicesBackupSchedulePolicyBase)ProviderData.ProviderParameters[PolicyParams.SchedulePolicy] :
310+
ProviderData.ContainsKey(PolicyParams.SchedulePolicy) ?
311+
(AzureRmRecoveryServicesBackupSchedulePolicyBase)ProviderData[PolicyParams.SchedulePolicy] :
312312
null;
313313

314314
AzureRmRecoveryServicesBackupPolicyBase policy =
315-
ProviderData.ProviderParameters.ContainsKey(PolicyParams.ProtectionPolicy) ?
316-
(AzureRmRecoveryServicesBackupPolicyBase)ProviderData.ProviderParameters[PolicyParams.ProtectionPolicy] :
315+
ProviderData.ContainsKey(PolicyParams.ProtectionPolicy) ?
316+
(AzureRmRecoveryServicesBackupPolicyBase)ProviderData[PolicyParams.ProtectionPolicy] :
317317
null;
318318

319319
// do validations
@@ -373,11 +373,11 @@ public ProtectionPolicyResponse ModifyPolicy()
373373

374374
public List<AzureRmRecoveryServicesBackupContainerBase> ListProtectionContainers()
375375
{
376-
Models.ContainerType containerType = (Models.ContainerType)this.ProviderData.ProviderParameters[ContainerParams.ContainerType];
377-
Models.BackupManagementType? backupManagementTypeNullable = (Models.BackupManagementType?)this.ProviderData.ProviderParameters[ContainerParams.BackupManagementType];
378-
string name = (string)this.ProviderData.ProviderParameters[ContainerParams.Name];
379-
string resourceGroupName = (string)this.ProviderData.ProviderParameters[ContainerParams.ResourceGroupName];
380-
ContainerRegistrationStatus status = (ContainerRegistrationStatus)this.ProviderData.ProviderParameters[ContainerParams.Status];
376+
Models.ContainerType containerType = (Models.ContainerType)this.ProviderData[ContainerParams.ContainerType];
377+
Models.BackupManagementType? backupManagementTypeNullable = (Models.BackupManagementType?)this.ProviderData[ContainerParams.BackupManagementType];
378+
string name = (string)this.ProviderData[ContainerParams.Name];
379+
string resourceGroupName = (string)this.ProviderData[ContainerParams.ResourceGroupName];
380+
ContainerRegistrationStatus status = (ContainerRegistrationStatus)this.ProviderData[ContainerParams.Status];
381381

382382
if (backupManagementTypeNullable.HasValue)
383383
{
@@ -420,13 +420,13 @@ public List<AzureRmRecoveryServicesBackupEngineBase> ListBackupManagementServers
420420
public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
421421
{
422422
AzureRmRecoveryServicesBackupContainerBase container =
423-
(AzureRmRecoveryServicesBackupContainerBase)this.ProviderData.ProviderParameters[ItemParams.Container];
424-
string name = (string)this.ProviderData.ProviderParameters[ItemParams.AzureVMName];
423+
(AzureRmRecoveryServicesBackupContainerBase)this.ProviderData[ItemParams.Container];
424+
string name = (string)this.ProviderData[ItemParams.AzureVMName];
425425
ItemProtectionStatus protectionStatus =
426-
(ItemProtectionStatus)this.ProviderData.ProviderParameters[ItemParams.ProtectionStatus];
427-
ItemProtectionState status = (ItemProtectionState)this.ProviderData.ProviderParameters[ItemParams.ProtectionState];
426+
(ItemProtectionStatus)this.ProviderData[ItemParams.ProtectionStatus];
427+
ItemProtectionState status = (ItemProtectionState)this.ProviderData[ItemParams.ProtectionState];
428428
Models.WorkloadType workloadType =
429-
(Models.WorkloadType)this.ProviderData.ProviderParameters[ItemParams.WorkloadType];
429+
(Models.WorkloadType)this.ProviderData[ItemParams.WorkloadType];
430430

431431
ProtectedItemListQueryParam queryParams = new ProtectedItemListQueryParam();
432432
queryParams.DatasourceType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.WorkloadType.VM;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2626
{
2727
public class MabPsBackupProvider : IPsBackupProvider
2828
{
29-
ProviderData ProviderData { get; set; }
29+
Dictionary<System.Enum, object> ProviderData { get; set; }
3030
HydraAdapter HydraAdapter { get; set; }
3131

32-
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
32+
public void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter)
3333
{
3434
this.ProviderData = providerData;
3535
this.HydraAdapter = hydraAdapter;
@@ -82,7 +82,7 @@ public ProtectionPolicyResponse ModifyPolicy()
8282

8383
public List<Models.AzureRmRecoveryServicesBackupContainerBase> ListProtectionContainers()
8484
{
85-
string name = (string)this.ProviderData.ProviderParameters[ContainerParams.Name];
85+
string name = (string)this.ProviderData[ContainerParams.Name];
8686

8787
ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();
8888

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderDC.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2525
{
2626
public class PsBackupProviderManager
2727
{
28-
ProviderData providerData;
28+
Dictionary<System.Enum, object> providerData;
2929
HydraAdapter hydraAdapter;
3030

31-
public PsBackupProviderManager(Dictionary<System.Enum, object> providerParams, HydraAdapter hydraAdapterIn)
32-
: this(new ProviderData(providerParams), hydraAdapterIn) { }
33-
34-
public PsBackupProviderManager(ProviderData providerDataIn, HydraAdapter hydraAdapterIn)
31+
public PsBackupProviderManager(Dictionary<System.Enum, object> providerDataIn, HydraAdapter hydraAdapterIn)
3532
{
3633
providerData = providerDataIn;
3734
hydraAdapter = hydraAdapterIn;

0 commit comments

Comments
 (0)