Skip to content

Commit 9b6f41f

Browse files
committed
moved provider specific logic to providers
1 parent d74a464 commit 9b6f41f

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/AzureFilesPsBackupProvider.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,21 @@ public List<ContainerBase> ListProtectionContainers()
8585
public RestAzureNS.AzureOperationResponse TriggerBackup()
8686
{
8787
string vaultName = (string)ProviderData[VaultParams.VaultName];
88-
string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
88+
string vaultResourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
8989
ItemBase item = (ItemBase)ProviderData[ItemParams.Item];
9090
DateTime? expiryDateTime = (DateTime?)ProviderData[ItemParams.ExpiryDateTimeUTC];
9191
AzureFileShareItem azureFileShareItem = item as AzureFileShareItem;
92+
BackupRequestResource triggerBackupRequest = new BackupRequestResource();
93+
AzureFileShareBackupRequest azureFileShareBackupRequest = new AzureFileShareBackupRequest();
94+
azureFileShareBackupRequest.RecoveryPointExpiryTimeInUTC = expiryDateTime;
95+
triggerBackupRequest.Properties = azureFileShareBackupRequest;
9296

9397
return ServiceClientAdapter.TriggerBackup(
9498
IdUtils.GetValueByName(azureFileShareItem.Id, IdUtils.IdNames.ProtectionContainerName),
9599
IdUtils.GetValueByName(azureFileShareItem.Id, IdUtils.IdNames.ProtectedItemName),
96-
expiryDateTime,
100+
triggerBackupRequest,
97101
vaultName: vaultName,
98-
resourceGroupName: resourceGroupName);
102+
resourceGroupName: vaultResourceGroupName);
99103
}
100104

101105
public RestAzureNS.AzureOperationResponse TriggerRestore()

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,15 @@ public RestAzureNS.AzureOperationResponse TriggerBackup()
239239
ItemBase item = (ItemBase)ProviderData[ItemParams.Item];
240240
DateTime? expiryDateTime = (DateTime?)ProviderData[ItemParams.ExpiryDateTimeUTC];
241241
AzureVmItem iaasVmItem = item as AzureVmItem;
242+
BackupRequestResource triggerBackupRequest = new BackupRequestResource();
243+
IaasVMBackupRequest iaasVmBackupRequest = new IaasVMBackupRequest();
244+
iaasVmBackupRequest.RecoveryPointExpiryTimeInUTC = expiryDateTime;
245+
triggerBackupRequest.Properties = iaasVmBackupRequest;
242246

243247
return ServiceClientAdapter.TriggerBackup(
244248
IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectionContainerName),
245249
IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectedItemName),
246-
expiryDateTime,
250+
triggerBackupRequest,
247251
vaultName: vaultName,
248252
resourceGroupName: resourceGroupName);
249253
}
@@ -732,7 +736,7 @@ public List<ItemBase> ListProtectedItems()
732736
serviceClientExtendedInfo.RecoveryPointCount : 0);
733737
((AzureVmItem)itemModel).ExtendedInfo = extendedInfo;
734738
});
735-
739+
736740
// 3. Filter by item's Protection Status
737741
if (protectionStatus != 0)
738742
{

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,10 @@ public List<ProtectedItemResource> ListProtectedItem(
131131
public RestAzureNS.AzureOperationResponse TriggerBackup(
132132
string containerName,
133133
string itemName,
134-
DateTime? expiryDateTimeUtc,
134+
BackupRequestResource triggerBackupRequest,
135135
string vaultName = null,
136136
string resourceGroupName = null)
137137
{
138-
BackupRequestResource triggerBackupRequest = new BackupRequestResource();
139-
if (string.Compare(containerName.Split(';')[0], "IaasVMContainer") == 0)
140-
{
141-
IaasVMBackupRequest iaasVmBackupRequest = new IaasVMBackupRequest();
142-
iaasVmBackupRequest.RecoveryPointExpiryTimeInUTC = expiryDateTimeUtc;
143-
triggerBackupRequest.Properties = iaasVmBackupRequest;
144-
}
145-
else if (string.Compare(containerName.Split(';')[0], "StorageContainer") == 0)
146-
{
147-
AzureFileShareBackupRequest azureFileShareBackupRequest = new AzureFileShareBackupRequest();
148-
azureFileShareBackupRequest.RecoveryPointExpiryTimeInUTC = expiryDateTimeUtc;
149-
triggerBackupRequest.Properties = azureFileShareBackupRequest;
150-
}
151-
152138
return BmsAdapter.Client.Backups.TriggerWithHttpMessagesAsync(
153139
vaultName ?? BmsAdapter.GetResourceName(),
154140
resourceGroupName ?? BmsAdapter.GetResourceGroupName(),

0 commit comments

Comments
 (0)