Skip to content

Commit 1711bb6

Browse files
sudhakar4171sudhakar4171
committed
incorporated PM feedback and minor fixes in policy
1 parent 0d90486 commit 1711bb6

23 files changed

+121
-115
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/Item/EnableAzureRmRecoveryServicesProtection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class EnableAzureRmRecoveryServicesProtection : RecoveryServicesBackupCmd
3939

4040
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.ProtectionPolicy)]
4141
[ValidateNotNullOrEmpty]
42-
public AzureRmRecoveryServicesPolicyBase Policy { get; set; }
42+
public AzureRmRecoveryServicesBackupPolicyBase Policy { get; set; }
4343

4444
[Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = AzureVMClassicComputeParameterSet, HelpMessage = ParamHelpMsg.Item.AzureVMName)]
4545
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = AzureVMComputeParameterSet, HelpMessage = ParamHelpMsg.Item.AzureVMName)]

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupRetentionPolicyObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
{
26-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupRetentionPolicyObject"), OutputType(typeof(AzureRmRecoveryServicesRetentionPolicyBase))]
26+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupRetentionPolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupRetentionPolicyBase))]
2727
public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoveryServicesBackupCmdletBase
2828
{
2929
[Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2929
/// <summary>
3030
/// Get list of protection policies
3131
/// </summary>
32-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesProtectionPolicy", DefaultParameterSetName = NoParamSet), OutputType(typeof(List<AzureRmRecoveryServicesPolicyBase>))]
32+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupProtectionPolicy", DefaultParameterSetName = NoParamSet),
33+
OutputType(typeof(List<AzureRmRecoveryServicesBackupPolicyBase>), typeof(AzureRmRecoveryServicesBackupPolicyBase))]
3334
public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
3435
{
3536
protected const string PolicyNameParamSet = "PolicyNameParamSet";
@@ -63,9 +64,6 @@ public override void ExecuteCmdlet()
6364
WorkloadType.HasValue ? WorkloadType.ToString() : "NULL",
6465
BackupManagementType.HasValue ? BackupManagementType.ToString() : "NULL",
6566
this.ParameterSetName));
66-
67-
68-
List<AzureRmRecoveryServicesPolicyBase> policyList = new List<AzureRmRecoveryServicesPolicyBase>();
6967

7068
if (this.ParameterSetName == PolicyNameParamSet)
7169
{
@@ -80,10 +78,12 @@ public override void ExecuteCmdlet()
8078
{
8179
throw new ArgumentException(string.Format(Resources.PolicyNotFoundException, Name));
8280
}
83-
policyList.Add(ConversionHelpers.GetPolicyModel(policy.Item));
81+
82+
WriteObject(ConversionHelpers.GetPolicyModel(policy.Item));
8483
}
8584
else
8685
{
86+
List<AzureRmRecoveryServicesBackupPolicyBase> policyList = new List<AzureRmRecoveryServicesBackupPolicyBase>();
8787
string hydraProviderType = null;
8888

8989
switch (this.ParameterSetName)
@@ -131,9 +131,8 @@ public override void ExecuteCmdlet()
131131
WriteDebug("Successfully got response from service");
132132

133133
policyList = ConversionHelpers.GetPolicyModelList(respList);
134-
}
135-
136-
WriteObject(policyList);
134+
WriteObject(policyList);
135+
}
137136
});
138137
}
139138
}

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesSchedulePolicyObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
{
26-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesSchedulePolicyObject"), OutputType(typeof(AzureRmRecoveryServicesSchedulePolicyBase))]
26+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesSchedulePolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupSchedulePolicyBase))]
2727
public class GetAzureRmRecoveryServicesSchedulePolicyObject : RecoveryServicesBackupCmdletBase
2828
{
2929
[Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2929
/// <summary>
3030
/// Create new protection policy
3131
/// </summary>
32-
[Cmdlet(VerbsCommon.New, "AzureRmRecoveryServicesProtectionPolicy"), OutputType(typeof(AzureRmRecoveryServicesPolicyBase))]
32+
[Cmdlet(VerbsCommon.New, "AzureRmRecoveryServicesBackupProtectionPolicy"), OutputType(typeof(AzureRmRecoveryServicesBackupPolicyBase))]
3333
public class NewAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
3434
{
3535
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.Name)]
@@ -46,11 +46,11 @@ public class NewAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
4646

4747
[Parameter(Position = 4, Mandatory = false, HelpMessage = ParamHelpMsg.Policy.RetentionPolicy, ValueFromPipelineByPropertyName = true)]
4848
[ValidateNotNullOrEmpty]
49-
public AzureRmRecoveryServicesRetentionPolicyBase RetentionPolicy { get; set; }
49+
public AzureRmRecoveryServicesBackupRetentionPolicyBase RetentionPolicy { get; set; }
5050

5151
[Parameter(Position = 5, Mandatory = false, HelpMessage = ParamHelpMsg.Policy.SchedulePolicy, ValueFromPipelineByPropertyName = true)]
5252
[ValidateNotNullOrEmpty]
53-
public AzureRmRecoveryServicesSchedulePolicyBase SchedulePolicy { get; set; }
53+
public AzureRmRecoveryServicesBackupSchedulePolicyBase SchedulePolicy { get; set; }
5454

5555
public override void ExecuteCmdlet()
5656
{

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/PolicyCmdletHelpers.cs

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using System;
16+
using System.Net;
1617
using System.Linq;
1718
using System.Text;
1819
using System.Threading.Tasks;
1920
using System.Collections.Generic;
2021
using System.Management.Automation;
2122
using System.Text.RegularExpressions;
23+
using Hyak.Common;
2224
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2325
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2426
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
@@ -60,10 +62,30 @@ public static ProtectionPolicyResponse GetProtectionPolicyByName(string policyNa
6062
response = hydraAdapter.GetProtectionPolicy(policyName);
6163
Logger.Instance.WriteDebug("Successfully fetched policy from service: " + policyName);
6264
}
63-
catch
65+
catch (AggregateException exception)
6466
{
65-
// if http response is NotFound - then ignore
66-
// else rethrow the exception - TBD
67+
// if http response is NotFound - then ignore and return NULL response
68+
if (exception.InnerException != null && exception.InnerException is CloudException)
69+
{
70+
var cloudEx = exception.InnerException as CloudException;
71+
if (cloudEx.Response != null)
72+
{
73+
if (cloudEx.Response.StatusCode != HttpStatusCode.NotFound)
74+
{
75+
Logger.Instance.WriteDebug("CloudException Response statusCode: " +
76+
cloudEx.Response.StatusCode);
77+
throw;
78+
}
79+
}
80+
else
81+
{
82+
throw;
83+
}
84+
}
85+
else
86+
{
87+
throw;
88+
}
6789
}
6890

6991
return response;

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/RemoveAzureRmRecoveryServicesPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class RemoveAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBac
4242
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.ProtectionPolicy, ValueFromPipeline = true,
4343
ParameterSetName = PolicyObjectParameterSet)]
4444
[ValidateNotNullOrEmpty]
45-
public AzureRmRecoveryServicesPolicyBase Policy { get; set; }
45+
public AzureRmRecoveryServicesBackupPolicyBase Policy { get; set; }
4646

4747
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.ConfirmationMessage)]
4848
public SwitchParameter Force { get; set; }

‎src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2929
/// <summary>
3030
/// Update existing protection policy
3131
/// </summary>
32-
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesProtectionPolicy"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>))]
32+
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesBackupProtectionPolicy"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>))]
3333
public class SetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
3434
{
3535
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.ProtectionPolicy, ValueFromPipeline = true)]
3636
[ValidateNotNullOrEmpty]
37-
public AzureRmRecoveryServicesPolicyBase Policy { get; set; }
37+
public AzureRmRecoveryServicesBackupPolicyBase Policy { get; set; }
3838

3939
[Parameter(Position = 2, Mandatory = false, HelpMessage = ParamHelpMsg.Policy.RetentionPolicy)]
4040
[ValidateNotNullOrEmpty]
41-
public AzureRmRecoveryServicesRetentionPolicyBase RetentionPolicy { get; set; }
41+
public AzureRmRecoveryServicesBackupRetentionPolicyBase RetentionPolicy { get; set; }
4242

4343
[Parameter(Position = 3, Mandatory = false, HelpMessage = ParamHelpMsg.Policy.SchedulePolicy)]
4444
[ValidateNotNullOrEmpty]
45-
public AzureRmRecoveryServicesSchedulePolicyBase SchedulePolicy { get; set; }
45+
public AzureRmRecoveryServicesBackupSchedulePolicyBase SchedulePolicy { get; set; }
4646

4747
public override void ExecuteCmdlet()
4848
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public static List<AzureRmRecoveryServicesContainerBase> GetContainerModelList(I
6161
#endregion
6262

6363
#region policy
64-
public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyResource hydraResponse)
64+
public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionPolicyResource hydraResponse)
6565
{
66-
AzureRmRecoveryServicesPolicyBase policyModel = null;
66+
AzureRmRecoveryServicesBackupPolicyBase policyModel = null;
6767

6868
if(hydraResponse == null || hydraResponse.Properties == null)
6969
{
@@ -116,7 +116,7 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
116116
return policyModel;
117117
}
118118

119-
public static List<AzureRmRecoveryServicesPolicyBase> GetPolicyModelList(
119+
public static List<AzureRmRecoveryServicesBackupPolicyBase> GetPolicyModelList(
120120
ProtectionPolicyListResponse hydraListResponse)
121121
{
122122
if(hydraListResponse == null || hydraListResponse.ItemList == null ||
@@ -126,8 +126,8 @@ public static List<AzureRmRecoveryServicesPolicyBase> GetPolicyModelList(
126126
return null;
127127
}
128128

129-
List<AzureRmRecoveryServicesPolicyBase> policyModels = new List<AzureRmRecoveryServicesPolicyBase>();
130-
AzureRmRecoveryServicesPolicyBase policyModel = null;
129+
List<AzureRmRecoveryServicesBackupPolicyBase> policyModels = new List<AzureRmRecoveryServicesBackupPolicyBase>();
130+
AzureRmRecoveryServicesBackupPolicyBase policyModel = null;
131131

132132
foreach(ProtectionPolicyResource resource in hydraListResponse.ItemList.Value)
133133
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public partial class PolicyHelpers
2828
#region HydraToPSObject conversions
2929

3030
#region public
31-
public static AzureRmRecoveryServicesLongTermRetentionPolicy GetPSLongTermRetentionPolicy(
31+
public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSLongTermRetentionPolicy(
3232
HydraModels.LongTermRetentionPolicy hydraRetPolicy)
3333
{
3434
if(hydraRetPolicy == null)
3535
{
3636
return null;
3737
}
3838

39-
AzureRmRecoveryServicesLongTermRetentionPolicy ltrPolicy = new AzureRmRecoveryServicesLongTermRetentionPolicy();
39+
AzureRmRecoveryServicesBackupLongTermRetentionPolicy ltrPolicy = new AzureRmRecoveryServicesBackupLongTermRetentionPolicy();
4040

4141
if(hydraRetPolicy.DailySchedule != null)
4242
{
@@ -68,7 +68,7 @@ public static AzureRmRecoveryServicesLongTermRetentionPolicy GetPSLongTermRetent
6868
return ltrPolicy;
6969
}
7070

71-
public static AzureRmRecoveryServicesLongTermRetentionPolicy GetPSSimpleRetentionPolicy(
71+
public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSSimpleRetentionPolicy(
7272
HydraModels.SimpleRetentionPolicy hydraRetPolicy)
7373
{
7474
throw new NotSupportedException();
@@ -324,7 +324,7 @@ private static WeeklyRetentionFormat GetPSLTRWeeklyRetentionFormat(
324324

325325
#region PStoHydraObject conversions
326326
public static HydraModels.LongTermRetentionPolicy GetHydraLongTermRetentionPolicy(
327-
AzureRmRecoveryServicesLongTermRetentionPolicy psRetPolicy)
327+
AzureRmRecoveryServicesBackupLongTermRetentionPolicy psRetPolicy)
328328
{
329329
if(psRetPolicy == null)
330330
{
@@ -357,7 +357,7 @@ public static HydraModels.LongTermRetentionPolicy GetHydraLongTermRetentionPolic
357357
}
358358

359359
public static HydraModels.SimpleRetentionPolicy GetHydraSimpleRetentionPolicy(
360-
AzureRmRecoveryServicesSimpleSchedulePolicy psRetPolicy)
360+
AzureRmRecoveryServicesBackupSimpleSchedulePolicy psRetPolicy)
361361
{
362362
throw new NotSupportedException();
363363
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public partial class PolicyHelpers
2626
{
2727
#region HydraToPSObject conversions
2828

29-
public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicy(
29+
public static AzureRmRecoveryServicesBackupSimpleSchedulePolicy GetPSSimpleSchedulePolicy(
3030
SimpleSchedulePolicy hydraPolicy)
3131
{
3232
if (hydraPolicy == null)
3333
{
3434
return null;
3535
}
3636

37-
AzureRmRecoveryServicesSimpleSchedulePolicy psPolicy = new AzureRmRecoveryServicesSimpleSchedulePolicy();
37+
AzureRmRecoveryServicesBackupSimpleSchedulePolicy psPolicy = new AzureRmRecoveryServicesBackupSimpleSchedulePolicy();
3838

3939
psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraPolicy.ScheduleRunDays);
4040
psPolicy.ScheduleRunFrequency = (ScheduleRunType)Enum.Parse(typeof(ScheduleRunType),
@@ -75,7 +75,7 @@ public static List<DateTime> ParseDateTimesToUTC(IList<DateTime> localTimes)
7575
}
7676

7777
public static SimpleSchedulePolicy GetHydraSimpleSchedulePolicy(
78-
AzureRmRecoveryServicesSimpleSchedulePolicy psPolicy)
78+
AzureRmRecoveryServicesBackupSimpleSchedulePolicy psPolicy)
7979
{
8080
if (psPolicy == null)
8181
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
2626
public partial class PolicyHelpers
2727
{
2828
public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
29-
AzureRmRecoveryServicesLongTermRetentionPolicy ltrPolicy,
30-
AzureRmRecoveryServicesSimpleSchedulePolicy schPolicy)
29+
AzureRmRecoveryServicesBackupLongTermRetentionPolicy ltrPolicy,
30+
AzureRmRecoveryServicesBackupSimpleSchedulePolicy schPolicy)
3131
{
3232
// for daily schedule, daily retention policy is required
3333
if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily &&

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmPolicy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
2222
{
23-
public class AzureRmRecoveryServicesIaasVmPolicy : AzureRmRecoveryServicesPolicyBase
23+
public class AzureRmRecoveryServicesIaasVmPolicy : AzureRmRecoveryServicesBackupPolicyBase
2424
{
25-
public AzureRmRecoveryServicesSchedulePolicyBase SchedulePolicy { get; set; }
25+
public AzureRmRecoveryServicesBackupSchedulePolicyBase SchedulePolicy { get; set; }
2626

27-
public AzureRmRecoveryServicesRetentionPolicyBase RetentionPolicy { get; set; }
27+
public AzureRmRecoveryServicesBackupRetentionPolicyBase RetentionPolicy { get; set; }
2828

2929
public override void Validate()
3030
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public AzureRmRecoveryServicesRecoveryPointBase()
167167
}
168168

169169

170-
public class AzureRmRecoveryServicesPolicyBase : AzureRmRecoveryServicesBackupManagementContext
170+
public class AzureRmRecoveryServicesBackupPolicyBase : AzureRmRecoveryServicesBackupManagementContext
171171
{
172172
public string Name { get; set; }
173173

@@ -191,15 +191,15 @@ public override void Validate()
191191
}
192192
}
193193

194-
public class AzureRmRecoveryServicesRetentionPolicyBase : AzureRmRecoveryServicesObjectBase
194+
public class AzureRmRecoveryServicesBackupRetentionPolicyBase : AzureRmRecoveryServicesObjectBase
195195
{
196196
public override void Validate()
197197
{
198198
base.Validate();
199199
}
200200
}
201201

202-
public class AzureRmRecoveryServicesSchedulePolicyBase : AzureRmRecoveryServicesObjectBase
202+
public class AzureRmRecoveryServicesBackupSchedulePolicyBase : AzureRmRecoveryServicesObjectBase
203203
{
204204
public override void Validate()
205205
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
2323
{
24-
public class AzureRmRecoveryServicesLongTermRetentionPolicy : AzureRmRecoveryServicesRetentionPolicyBase
24+
public class AzureRmRecoveryServicesBackupLongTermRetentionPolicy : AzureRmRecoveryServicesBackupRetentionPolicyBase
2525
{
2626
public bool IsDailyScheduleEnabled { get; set; }
2727
public bool IsWeeklyScheduleEnabled { get; set; }
@@ -32,7 +32,7 @@ public class AzureRmRecoveryServicesLongTermRetentionPolicy : AzureRmRecoverySer
3232
public MonthlyRetentionSchedule MonthlySchedule { get; set; }
3333
public YearlyRetentionSchedule YearlySchedule { get; set; }
3434

35-
public AzureRmRecoveryServicesLongTermRetentionPolicy()
35+
public AzureRmRecoveryServicesBackupLongTermRetentionPolicy()
3636
{
3737
IsDailyScheduleEnabled = false;
3838
IsWeeklyScheduleEnabled = false;
@@ -295,7 +295,7 @@ public override string ToString()
295295
base.ToString(),
296296
RetentionScheduleDaily == null ? "NULL" : RetentionScheduleDaily.ToString(),
297297
RetentionScheduleWeekly == null ? "NULL" : RetentionScheduleWeekly.ToString(),
298-
TraceUtils.GetEnumsString<Month>(MonthsOfYear), base.ToString());
298+
TraceUtils.GetString<Month>(MonthsOfYear), base.ToString());
299299
}
300300
}
301301

@@ -365,7 +365,7 @@ public override string ToString()
365365
{
366366
return string.Format("DaysOfTheWeek:{0}, WeeksOfTheMonth:{1}",
367367
TraceUtils.GetString(DaysOfTheWeek),
368-
TraceUtils.GetEnumsString<WeekOfMonth>(WeeksOfTheMonth));
368+
TraceUtils.GetString<WeekOfMonth>(WeeksOfTheMonth));
369369
}
370370
}
371371

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyScheduleObjects.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
2323
{
24-
public class AzureRmRecoveryServicesSimpleSchedulePolicy : AzureRmRecoveryServicesSchedulePolicyBase
24+
public class AzureRmRecoveryServicesBackupSimpleSchedulePolicy : AzureRmRecoveryServicesBackupSchedulePolicyBase
2525
{
2626
public ScheduleRunType ScheduleRunFrequency { get; set; }
2727

0 commit comments

Comments
 (0)