Skip to content

Commit 16939dd

Browse files
mkheranimkherani
committed
merge from dev1
2 parents 1ac2c16 + 5350ada commit 16939dd

File tree

13 files changed

+77
-52
lines changed

13 files changed

+77
-52
lines changed

‎ChangeLog.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,31 @@
1414
- New-AzureStorageShareSASToken
1515
- New-AzureStorageShareStoredAccessPolicy
1616
- Set-AzureStorageShareStoredAccessPolicy
17+
* Added Recovery Services Backup cmdlets
18+
- Set-AzureRmRecoveryServicesVaultContext
19+
- Set-AzureRmRecoveryServicesBackupProperties
20+
- Get-AzureRmRecoveryServicesBackupProperties
21+
- Get-AzureRmRecoveryServicesVaultSettingsFile
22+
- Backup-AzureRmRecoveryServicesBackupItem
23+
- Get-AzureRmRecoveryServicesBackupContainer
24+
- Get-AzureRmRecoveryServicesBackupManagementServer
25+
- Unregister-AzureRmRecoveryServicesBackupContainer
26+
- Unregister-AzureRmRecoveryServicesBackupManagementServer
27+
- Disable-AzureRmRecoveryServicesBackupProtection
28+
- Enable-AzureRmRecoveryServicesBackupProtection
29+
- Get-AzureRmRecoveryServicesBackupItem
30+
- Get-AzureRmRecoveryServicesBackupJob
31+
- Get-AzureRmRecoveryServicesBackupJobDetails
32+
- Stop-AzureRmRecoveryServicesBackupJob
33+
- Wait-AzureRmRecoveryServicesBackupJob
34+
- Get-AzureRmRecoveryServicesBackupRetentionPolicyObject
35+
- Get-AzureRmRecoveryServicesBackupProtectionPolicy
36+
- Get-AzureRmRecoveryServicesBackupSchedulePolicyObject
37+
- New-AzureRmRecoveryServicesBackupProtectionPolicy
38+
- Remove-AzureRmRecoveryServicesBackupProtectionPolicy
39+
- Set-AzureRmRecoveryServicesBackupProtectionPolicy
40+
- Get-AzureRmRecoveryServicesBackupRecoveryPoint
41+
- Restore-AzureRmRecoveryServicesBackupItem
1742

1843
##2016.04.19 version 1.3.2
1944
* Add support for specifying NIC/VMSS as application gateway backend address

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public class JobConversions
3131
/// </summary>
3232
/// <param name="hydraJob"></param>
3333
/// <returns></returns>
34-
public static AzureRmRecoveryServicesJobBase GetPSJob(JobResponse hydraJob)
34+
public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob)
3535
{
3636
return GetPSJob(hydraJob.Item);
3737
}
3838

39-
public static AzureRmRecoveryServicesJobBase GetPSJob(JobResource hydraJob)
39+
public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob)
4040
{
41-
AzureRmRecoveryServicesJobBase response = null;
41+
AzureRmRecoveryServicesBackupJobBase response = null;
4242

4343
// hydra doesn't initialize Properties if the type of job is not known to current version of hydra.
4444
if (hydraJob.Properties == null)
@@ -53,13 +53,13 @@ public static AzureRmRecoveryServicesJobBase GetPSJob(JobResource hydraJob)
5353
return response;
5454
}
5555

56-
public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmRecoveryServicesJobBase> psJobs, ref int jobsCount)
56+
public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
5757
{
5858
if (hydraJobs.ItemList != null && hydraJobs.ItemList.Value != null)
5959
{
6060
foreach (var job in hydraJobs.ItemList.Value)
6161
{
62-
AzureRmRecoveryServicesJobBase convertedJob = GetPSJob(job);
62+
AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job);
6363
if (convertedJob != null)
6464
{
6565
jobsCount++;
@@ -71,19 +71,19 @@ public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmR
7171

7272
#region AzureVm job private helpers
7373

74-
private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
74+
private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
7575
{
76-
AzureRmRecoveryServicesAzureVmJob response;
76+
AzureRmRecoveryServicesBackupAzureVmJob response;
7777

7878
AzureIaaSVMJob vmJob = hydraJob.Properties as AzureIaaSVMJob;
7979

8080
if (vmJob.ExtendedInfo != null)
8181
{
82-
response = new AzureRmRecoveryServicesAzureVmJobDetails();
82+
response = new AzureRmRecoveryServicesBackupAzureVmJobDetails();
8383
}
8484
else
8585
{
86-
response = new AzureRmRecoveryServicesAzureVmJob();
86+
response = new AzureRmRecoveryServicesBackupAzureVmJob();
8787
}
8888

8989
response.JobId = GetLastIdFromFullId(hydraJob.Id);
@@ -99,7 +99,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
9999

100100
if (vmJob.ErrorDetails != null)
101101
{
102-
response.ErrorDetails = new List<AzureRmRecoveryServicesAzureVmJobErrorInfo>();
102+
response.ErrorDetails = new List<AzureRmRecoveryServicesBackupAzureVmJobErrorInfo>();
103103
foreach (var vmError in vmJob.ErrorDetails)
104104
{
105105
response.ErrorDetails.Add(GetPSAzureVmErrorInfo(vmError));
@@ -109,8 +109,8 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
109109
// fill extended info if present
110110
if (vmJob.ExtendedInfo != null)
111111
{
112-
AzureRmRecoveryServicesAzureVmJobDetails detailedResponse =
113-
response as AzureRmRecoveryServicesAzureVmJobDetails;
112+
AzureRmRecoveryServicesBackupAzureVmJobDetails detailedResponse =
113+
response as AzureRmRecoveryServicesBackupAzureVmJobDetails;
114114

115115
detailedResponse.DynamicErrorMessage = vmJob.ExtendedInfo.DynamicErrorMessage;
116116
if (vmJob.ExtendedInfo.PropertyBag != null)
@@ -124,10 +124,10 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
124124

125125
if (vmJob.ExtendedInfo.TasksList != null)
126126
{
127-
detailedResponse.SubTasks = new List<AzureRmRecoveryServicesAzureVmJobSubTask>();
127+
detailedResponse.SubTasks = new List<AzureRmRecoveryServicesBackupAzureVmJobSubTask>();
128128
foreach (var vmJobTask in vmJob.ExtendedInfo.TasksList)
129129
{
130-
detailedResponse.SubTasks.Add(new AzureRmRecoveryServicesAzureVmJobSubTask()
130+
detailedResponse.SubTasks.Add(new AzureRmRecoveryServicesBackupAzureVmJobSubTask()
131131
{
132132
Name = vmJobTask.TaskId,
133133
Status = vmJobTask.Status
@@ -139,9 +139,9 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
139139
return response;
140140
}
141141

142-
private static AzureRmRecoveryServicesAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
142+
private static AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
143143
{
144-
AzureRmRecoveryServicesAzureVmJobErrorInfo psErrorInfo = new AzureRmRecoveryServicesAzureVmJobErrorInfo();
144+
AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
145145
psErrorInfo.ErrorCode = hydraError.ErrorCode;
146146
psErrorInfo.ErrorMessage = hydraError.ErrorString;
147147
if (hydraError.Recommendations != null)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
1818
{
19-
public class AzureRmRecoveryServicesAzureVmJob : AzureRmRecoveryServicesJobBase
19+
public class AzureRmRecoveryServicesBackupAzureVmJob : AzureRmRecoveryServicesBackupJobBase
2020
{
2121
public bool IsCancellable { get; set; }
2222

2323
public bool IsRetriable { get; set; }
2424

2525
public string VmVersion { get; set; }
2626

27-
public List<AzureRmRecoveryServicesAzureVmJobErrorInfo> ErrorDetails { get; set; }
27+
public List<AzureRmRecoveryServicesBackupAzureVmJobErrorInfo> ErrorDetails { get; set; }
2828
}
2929

30-
public class AzureRmRecoveryServicesAzureVmJobDetails : AzureRmRecoveryServicesAzureVmJob
30+
public class AzureRmRecoveryServicesBackupAzureVmJobDetails : AzureRmRecoveryServicesBackupAzureVmJob
3131
{
3232
/// <summary>
3333
/// Context sensitive error message that might be helpful in debugging the issue.
@@ -37,15 +37,15 @@ public class AzureRmRecoveryServicesAzureVmJobDetails : AzureRmRecoveryServicesA
3737

3838
public Dictionary<string, string> Properties { get; set; }
3939

40-
public List<AzureRmRecoveryServicesAzureVmJobSubTask> SubTasks { get; set; }
40+
public List<AzureRmRecoveryServicesBackupAzureVmJobSubTask> SubTasks { get; set; }
4141
}
4242

43-
public class AzureRmRecoveryServicesAzureVmJobErrorInfo : AzureRmRecoveryServicesJobErrorInfoBase
43+
public class AzureRmRecoveryServicesBackupAzureVmJobErrorInfo : AzureRmRecoveryServicesBackupJobErrorInfoBase
4444
{
4545
public int ErrorCode { get; set; }
4646
}
4747

48-
public class AzureRmRecoveryServicesAzureVmJobSubTask : AzureRmRecoveryServicesJobSubTaskBase
48+
public class AzureRmRecoveryServicesBackupAzureVmJobSubTask : AzureRmRecoveryServicesBackupJobSubTaskBase
4949
{
5050
}
5151
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public override void Validate()
240240
}
241241
}
242242

243-
public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesBackupManagementContext
243+
public class AzureRmRecoveryServicesBackupJobBase : AzureRmRecoveryServicesBackupManagementContext
244244
{
245245
public string ActivityId { get; set; }
246246

@@ -267,7 +267,7 @@ public override void Validate()
267267
/// <summary>
268268
/// This class is does not represent first class resource. So, we are not inheriting from the base class.
269269
/// </summary>
270-
public class AzureRmRecoveryServicesJobErrorInfoBase
270+
public class AzureRmRecoveryServicesBackupJobErrorInfoBase
271271
{
272272
public string ErrorMessage { get; set; }
273273

@@ -277,7 +277,7 @@ public class AzureRmRecoveryServicesJobErrorInfoBase
277277
/// <summary>
278278
/// This class is does not represent a first class resource. So, we are not inheriting from the common base class.
279279
/// </summary>
280-
public class AzureRmRecoveryServicesJobSubTaskBase
280+
public class AzureRmRecoveryServicesBackupJobSubTaskBase
281281
{
282282
public string Name { get; set; }
283283

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Backup/BackupAzureRmRecoveryServicesItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2828
/// <summary>
2929
/// Backup Item
3030
/// </summary>
31-
[Cmdlet(VerbsData.Backup, "AzureRmRecoveryServicesBackupItem"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
31+
[Cmdlet(VerbsData.Backup, "AzureRmRecoveryServicesBackupItem"), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
3232
public class BackupAzureRmRecoveryServicesBackupItem : RecoveryServicesBackupCmdletBase
3333
{
3434
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Item.ProtectedItem, ValueFromPipeline = true)]

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Item/DisableAzureRmRecoveryServicesProtection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3030
/// <summary>
3131
/// Enable Azure Backup protection
3232
/// </summary>
33-
[Cmdlet(VerbsLifecycle.Disable, "AzureRmRecoveryServicesBackupProtection"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
33+
[Cmdlet(VerbsLifecycle.Disable, "AzureRmRecoveryServicesBackupProtection"), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
3434
public class DisableAzureRmRecoveryServicesBackupProtection : RecoveryServicesBackupCmdletBase
3535
{
3636
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Item.ProtectedItem, ValueFromPipeline = true)]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3030
/// <summary>
3131
/// Enable Azure Backup protection
3232
/// </summary>
33-
[Cmdlet(VerbsLifecycle.Enable, "AzureRmRecoveryServicesBackupProtection", DefaultParameterSetName = AzureVMComputeParameterSet), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
33+
[Cmdlet(VerbsLifecycle.Enable, "AzureRmRecoveryServicesBackupProtection", DefaultParameterSetName = AzureVMComputeParameterSet), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
3434
public class EnableAzureRmRecoveryServicesBackupProtection : RecoveryServicesBackupCmdletBase
3535
{
3636
internal const string AzureVMClassicComputeParameterSet = "AzureVMClassicComputeEnableProtection";

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2424
/// <summary>
2525
/// Get list of jobs
2626
/// </summary>
27-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
28-
public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
27+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupJob"), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
28+
public class GetAzureRmRecoveryServicesBackupJob : RecoveryServicesBackupCmdletBase
2929
{
3030
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter, Position = 1)]
3131
[ValidateNotNullOrEmpty]
@@ -49,7 +49,7 @@ public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
4949

5050
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.JobFilter, Position = 6)]
5151
[ValidateNotNull]
52-
public AzureRmRecoveryServicesJobBase Job { get; set; }
52+
public AzureRmRecoveryServicesBackupJobBase Job { get; set; }
5353

5454
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.BackupManagementTypeFilter)]
5555
[ValidateNotNullOrEmpty]
@@ -109,7 +109,7 @@ public override void ExecuteCmdlet()
109109
JobId = Job.JobId;
110110
}
111111

112-
List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();
112+
List<AzureRmRecoveryServicesBackupJobBase> result = new List<AzureRmRecoveryServicesBackupJobBase>();
113113

114114
WriteDebug(string.Format("Filters provided are: StartTime - {0} EndTime - {1} Status - {2} Operation - {3} Type - {4}",
115115
From,

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJobDetails.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2020
{
21-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupJobDetails", DefaultParameterSetName = JobFilterSet), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
22-
public class GetAzureRmRecoveryServicesJobDetails : RecoveryServicesBackupCmdletBase
21+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupJobDetails", DefaultParameterSetName = JobFilterSet), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
22+
public class GetAzureRmRecoveryServicesBackupJobDetails : RecoveryServicesBackupCmdletBase
2323
{
2424
protected const string IdFilterSet = "IdFilterSet";
2525
protected const string JobFilterSet = "JobFilterSet";
2626

2727
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobFilter, ParameterSetName = JobFilterSet, Position = 1)]
2828
[ValidateNotNull]
29-
public AzureRmRecoveryServicesJobBase Job { get; set; }
29+
public AzureRmRecoveryServicesBackupJobBase Job { get; set; }
3030

3131
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobIdFilter, ParameterSetName = IdFilterSet, Position = 2)]
3232
[ValidateNotNullOrEmpty]

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/StopAzureRmRecoveryServicesJob.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424

2525
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2626
{
27-
[Cmdlet("Stop", "AzureRmRecoveryServicesBackupJob", DefaultParameterSetName = JobFilterSet), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
28-
public class StopAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
27+
[Cmdlet("Stop", "AzureRmRecoveryServicesBackupJob", DefaultParameterSetName = JobFilterSet), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
28+
public class StopAzureRmRecoveryServicesBackupJob : RecoveryServicesBackupCmdletBase
2929
{
3030
protected const string IdFilterSet = "IdFilterSet";
3131
protected const string JobFilterSet = "JobFilterSet";
3232

3333
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.StopJobJobFilter, ParameterSetName = JobFilterSet, Position = 1)]
3434
[ValidateNotNull]
35-
public AzureRmRecoveryServicesJobBase Job { get; set; }
35+
public AzureRmRecoveryServicesBackupJobBase Job { get; set; }
3636

3737
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.StopJobJobIdFilter, ParameterSetName = IdFilterSet, Position = 2)]
3838
[ValidateNotNull]

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
{
26-
[Cmdlet("Wait", "AzureRmRecoveryServicesBackupJob"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
27-
public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
26+
[Cmdlet("Wait", "AzureRmRecoveryServicesBackupJob"), OutputType(typeof(AzureRmRecoveryServicesBackupJobBase))]
27+
public class WaitAzureRmRecoveryServicesBackupJob : RecoveryServicesBackupCmdletBase
2828
{
2929
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter, ValueFromPipeline = true, Position = 1)]
3030
[ValidateNotNull]
@@ -40,17 +40,17 @@ public override void ExecuteCmdlet()
4040
base.ExecuteCmdlet();
4141

4242
List<string> jobsToWaitOn = new List<string>();
43-
List<AzureRmRecoveryServicesJobBase> finalJobs = new List<AzureRmRecoveryServicesJobBase>();
43+
List<AzureRmRecoveryServicesBackupJobBase> finalJobs = new List<AzureRmRecoveryServicesBackupJobBase>();
4444

4545
object castedObj;
46-
if (GetCastedObjFromPSObj<AzureRmRecoveryServicesJobBase>(Job, out castedObj))
46+
if (GetCastedObjFromPSObj<AzureRmRecoveryServicesBackupJobBase>(Job, out castedObj))
4747
{
48-
AzureRmRecoveryServicesJobBase justJob = castedObj as AzureRmRecoveryServicesJobBase;
48+
AzureRmRecoveryServicesBackupJobBase justJob = castedObj as AzureRmRecoveryServicesBackupJobBase;
4949
jobsToWaitOn.Add(justJob.JobId);
5050
}
51-
else if (GetCastedObjFromPSObj<List<AzureRmRecoveryServicesJobBase>>(Job, out castedObj))
51+
else if (GetCastedObjFromPSObj<List<AzureRmRecoveryServicesBackupJobBase>>(Job, out castedObj))
5252
{
53-
List<AzureRmRecoveryServicesJobBase> jobsList = castedObj as List<AzureRmRecoveryServicesJobBase>;
53+
List<AzureRmRecoveryServicesBackupJobBase> jobsList = castedObj as List<AzureRmRecoveryServicesBackupJobBase>;
5454
foreach (var job in jobsList)
5555
{
5656
jobsToWaitOn.Add(job.JobId);
@@ -62,9 +62,9 @@ public override void ExecuteCmdlet()
6262
object castedJob;
6363
foreach (var job in castedJobsList)
6464
{
65-
if (GetCastedObjFromPSObj<AzureRmRecoveryServicesJobBase>(job, out castedJob))
65+
if (GetCastedObjFromPSObj<AzureRmRecoveryServicesBackupJobBase>(job, out castedJob))
6666
{
67-
jobsToWaitOn.Add((castedJob as AzureRmRecoveryServicesJobBase).JobId);
67+
jobsToWaitOn.Add((castedJob as AzureRmRecoveryServicesBackupJobBase).JobId);
6868
}
6969
else
7070
{
@@ -152,7 +152,7 @@ private bool GetCastedObjFromPSObj<T>(object obj, out object castedJob) where T
152152

153153
// Move the following function to a common helper file later when
154154
// more functions of this type are required.
155-
private bool IsJobInProgress(AzureRmRecoveryServicesJobBase job)
155+
private bool IsJobInProgress(AzureRmRecoveryServicesBackupJobBase job)
156156
{
157157
if (job.Status.CompareTo("InProgress") == 0 ||
158158
job.Status.CompareTo("Cancelling") == 0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2929
/// <summary>
3030
/// Update existing protection policy
3131
/// </summary>
32-
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesBackupProtectionPolicy"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>))]
32+
[Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesBackupProtectionPolicy"), OutputType(typeof(List<AzureRmRecoveryServicesBackupJobBase>))]
3333
public class SetAzureRmRecoveryServicesBackupProtectionPolicy : RecoveryServicesBackupCmdletBase
3434
{
3535
[Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.ProtectionPolicy, ValueFromPipeline = true)]

0 commit comments

Comments
 (0)