Skip to content

Commit d71f98b

Browse files
author
dragonfly91
committed
Merge branch 'dev1' into anudeeb-dev1
2 parents 78c2d1b + 88cad0e commit d71f98b

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
{
2626
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupRetentionPolicyObject"), OutputType(typeof(AzureRmRecoveryServicesRetentionPolicyBase))]
27-
class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoveryServicesBackupCmdletBase
27+
public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoveryServicesBackupCmdletBase
2828
{
2929
[Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]
3030
[ValidateNotNullOrEmpty]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
{
2626
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesSchedulePolicyObject"), OutputType(typeof(AzureRmRecoveryServicesSchedulePolicyBase))]
27-
class GetAzureRmRecoveryServicesSchedulePolicyObject : RecoveryServicesBackupCmdletBase
27+
public class GetAzureRmRecoveryServicesSchedulePolicyObject : RecoveryServicesBackupCmdletBase
2828
{
2929
[Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]
3030
[ValidateNotNullOrEmpty]

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,7 @@ private static HydraModels.MonthlyRetentionSchedule GetHydraLTRMonthlySchedule(M
419419
};
420420
hydraMonthly.RetentionTimes = psMonthly.RetentionTimes;
421421

422-
hydraMonthly.RetentionScheduleFormatType = Enum.Parse(typeof(HydraModels.RetentionScheduleFormat),
423-
psMonthly.RetentionScheduleFormatType.ToString()).ToString();
422+
hydraMonthly.RetentionScheduleFormatType = psMonthly.RetentionScheduleFormatType.ToString();
424423
if (psMonthly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
425424
{
426425
hydraMonthly.RetentionScheduleDaily = GetHydraLTRDailyRetentionFormat(psMonthly.RetentionScheduleDaily);
@@ -445,12 +444,11 @@ private static HydraModels.YearlyRetentionSchedule GetHydraLTRYearlySchedule(Yea
445444
hydraYearly.RetentionDuration = new HydraModels.RetentionDuration()
446445
{
447446
Count = psYearly.DurationCountInYears,
448-
DurationType = HydraModels.RetentionDurationType.Months
447+
DurationType = HydraModels.RetentionDurationType.Years
449448
};
450449
hydraYearly.RetentionTimes = psYearly.RetentionTimes;
451450

452-
hydraYearly.RetentionScheduleFormatType = Enum.Parse(typeof(HydraModels.RetentionScheduleFormat),
453-
psYearly.RetentionScheduleFormatType.ToString()).ToString();
451+
hydraYearly.RetentionScheduleFormatType = psYearly.RetentionScheduleFormatType.ToString();
454452
if (psYearly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
455453
{
456454
hydraYearly.RetentionScheduleDaily = GetHydraLTRDailyRetentionFormat(psYearly.RetentionScheduleDaily);

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,8 @@ public AzureRmRecoveryServicesRetentionPolicyBase GetDefaultRetentionPolicyObjec
462462
defaultRetention.IsMonthlyScheduleEnabled = true;
463463
defaultRetention.MonthlySchedule = new Models.MonthlyRetentionSchedule();
464464
defaultRetention.MonthlySchedule.DurationCountInMonths = 60; //tbd: make it const
465+
defaultRetention.MonthlySchedule.RetentionTimes = new List<DateTime>();
466+
defaultRetention.MonthlySchedule.RetentionTimes.Add(retentionTime);
465467
defaultRetention.MonthlySchedule.RetentionScheduleFormatType = Models.RetentionScheduleFormat.Weekly;
466468

467469
//Initialize day based schedule
@@ -474,6 +476,8 @@ public AzureRmRecoveryServicesRetentionPolicyBase GetDefaultRetentionPolicyObjec
474476
defaultRetention.IsYearlyScheduleEnabled = true;
475477
defaultRetention.YearlySchedule = new Models.YearlyRetentionSchedule();
476478
defaultRetention.YearlySchedule.DurationCountInYears = 10;
479+
defaultRetention.YearlySchedule.RetentionTimes = new List<DateTime>();
480+
defaultRetention.YearlySchedule.RetentionTimes.Add(retentionTime);
477481
defaultRetention.YearlySchedule.RetentionScheduleFormatType = Models.RetentionScheduleFormat.Weekly;
478482
defaultRetention.YearlySchedule.MonthsOfYear = new List<Models.Month>();
479483
defaultRetention.YearlySchedule.MonthsOfYear.Add(Models.Month.January);
@@ -730,17 +734,17 @@ private void CopyScheduleTimeToRetentionTimes(AzureRmRecoveryServicesLongTermRet
730734

731735
if (retPolicy.IsWeeklyScheduleEnabled && retPolicy.WeeklySchedule != null)
732736
{
733-
retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
737+
retPolicy.WeeklySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
734738
}
735739

736740
if (retPolicy.IsMonthlyScheduleEnabled && retPolicy.MonthlySchedule != null)
737741
{
738-
retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
742+
retPolicy.MonthlySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
739743
}
740744

741745
if (retPolicy.IsYearlyScheduleEnabled && retPolicy.YearlySchedule != null)
742746
{
743-
retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
747+
retPolicy.YearlySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
744748
}
745749
}
746750

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
<Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
9999
<Name>Commands.ScenarioTests.ResourceManager.Common</Name>
100100
</ProjectReference>
101+
<ProjectReference Include="..\..\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj">
102+
<Project>{604260dc-b392-4cf4-81ec-34b14591e2d2}</Project>
103+
<Name>Commands.RecoveryServices</Name>
104+
</ProjectReference>
101105
<ProjectReference Include="..\Commands.RecoveryServices.Backup.Cmdlets.csproj">
102106
<Project>{3b3e879a-f856-46bf-aff9-8ad6760cf7b9}</Project>
103107
<Name>Commands.RecoveryServices.Backup.Cmdlets</Name>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/PolicyTests.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ function Test-PolicyScenario
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
1919

2020
# get default objects
21-
$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
22-
$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
21+
#$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
22+
#$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
2323

2424
# now create new policy
25-
$policy = New-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1" -WorkloadType "AzureVM" -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy
25+
#$policy = New-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1" -WorkloadType "AzureVM" -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy
2626

2727
# now get policy and update it with new schedule/retention
2828
$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
2929
$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
3030

31-
Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1" | Set-AzureRmRecoveryServicesProtectionPolicy -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy
31+
$temp = Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1"
32+
Set-AzureRmRecoveryServicesProtectionPolicy -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy -Policy $temp[0]
3233

3334
echo $schedulePolicy
3435
}

0 commit comments

Comments
 (0)