Skip to content

Commit 3b754b0

Browse files
Merge pull request #274 from MabOneSdk/swatim-dev1
Adding strings to resource file for PsBackupProviderManager.cs
2 parents 0a2a030 + 19dd290 commit 3b754b0

File tree

4 files changed

+59
-17
lines changed

4 files changed

+59
-17
lines changed

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public enum ContainerType
3030
public enum BackupManagementType
3131
{
3232
AzureVM = 1,
33-
MARS
33+
MARS,
34+
SCDPM
3435
}
3536

3637
public enum BackupEngineType

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,16 @@ Please contact Microsoft for further assistant.</value>
419419
<data name="GetRPErrorInputDatesShouldBeInUTC" xml:space="preserve">
420420
<value>Both EndDate and StartDate should be in UTC format</value>
421421
</data>
422+
<data name="BackupManagementTypeNotExpectedForWorkloadType" xml:space="preserve">
423+
<value>BackupManagementType is not expected for WorkloadType: {0}</value>
424+
</data>
425+
<data name="BackupManagementTypeRequiredForContainerType" xml:space="preserve">
426+
<value>BackupManagementType provider for ContainerType {0} is incorrect.</value>
427+
</data>
428+
<data name="BackupManagementTypeRequiredForWorkloadType" xml:space="preserve">
429+
<value>BackupManagementType is also required for WorkloadType: {0}</value>
430+
</data>
431+
<data name="UnsupportedContainerType" xml:space="preserve">
432+
<value>Unsupported containerType: {0}</value>
433+
</data>
422434
</root>

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
1616
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
17+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
1718
using System;
1819
using System.Collections.Generic;
1920
using System.Linq;
@@ -49,18 +50,10 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
4950
if (backupManagementType == BackupManagementType.MARS)
5051
providerType = PsBackupProviderTypes.Mab;
5152
else
52-
throw new ArgumentException(String.Format("BackupManagementType is required for ContainerType {1}.", backupManagementType.ToString(), containerType));
53+
throw new ArgumentException(String.Format(Resources.BackupManagementTypeRequiredForContainerType, containerType));
5354
break;
54-
//case ContainerType.AzureSqlContainer:
55-
// if (backupManagementType.HasValue)
56-
// {
57-
// throw new ArgumentException("BackupManagementType is not expected for ContainerType: " +
58-
// containerType.ToString());
59-
// }
60-
// providerType = PsBackupProviderTypes.AzureSql;
61-
// break;
6255
default:
63-
throw new ArgumentException("Unsupported containerType: " + containerType.ToString());
56+
throw new ArgumentException(String.Format(Resources.UnsupportedContainerType, containerType.ToString()));
6457
}
6558

6659
return GetProviderInstance(providerType);
@@ -81,8 +74,8 @@ public IPsBackupProvider GetProviderInstance(WorkloadType workloadType)
8174
providerType = PsBackupProviderTypes.IaasVm;
8275
break;
8376
default:
84-
throw new ArgumentException("BackupManagementType is also required for WorkloadType: " +
85-
workloadType.ToString());
77+
throw new ArgumentException(String.Format(Resources.BackupManagementTypeRequiredForWorkloadType,
78+
workloadType.ToString()));
8679
}
8780

8881
return GetProviderInstance(providerType);
@@ -104,13 +97,13 @@ public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupMa
10497
if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureVM)
10598
{
10699
// throw exception that it is not expected
107-
throw new ArgumentException("BackupManagementType is not expected for WorkloadType: " +
108-
workloadType.ToString());
100+
throw new ArgumentException(String.Format(Resources.BackupManagementTypeNotExpectedForWorkloadType,
101+
workloadType.ToString()));
109102
}
110103
psProviderType = PsBackupProviderTypes.IaasVm;
111104
break;
112105
default:
113-
throw new ArgumentException("Unsupported workloadType: " + workloadType.ToString());
106+
throw new ArgumentException(String.Format(Resources.UnsupportedWorkloadTypeException, workloadType.ToString()));
114107
}
115108

116109
return GetProviderInstance(psProviderType);

0 commit comments

Comments
 (0)