Skip to content

Commit fccfb48

Browse files
author
dragonfly91
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents 8171fc9 + 0a1ec36 commit fccfb48

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,34 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
2828
public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
2929
{
30-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.FromFilter)]
30+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter, Position = 1)]
31+
[ValidateNotNullOrEmpty]
32+
public JobStatus? Status { get; set; }
33+
34+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.OperationFilter, Position = 2)]
35+
[ValidateNotNullOrEmpty]
36+
public JobOperation? Operation { get; set; }
37+
38+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.FromFilter, Position = 3)]
3139
[ValidateNotNull]
3240
public DateTime? From { get; set; }
3341

34-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.ToFilter)]
42+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.ToFilter, Position = 4)]
3543
[ValidateNotNull]
3644
public DateTime? To { get; set; }
3745

38-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.JobIdFilter)]
46+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.JobIdFilter, Position = 5)]
3947
[ValidateNotNullOrEmpty]
4048
public string JobId { get; set; }
4149

42-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.JobFilter)]
50+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.JobFilter, Position = 6)]
4351
[ValidateNotNull]
4452
public AzureRmRecoveryServicesJobBase Job { get; set; }
4553

4654
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.BackupManagementTypeFilter)]
4755
[ValidateNotNullOrEmpty]
4856
public BackupManagementType? BackupManagementType { get; set; }
4957

50-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.OperationFilter)]
51-
[ValidateNotNullOrEmpty]
52-
public JobOperation? Operation { get; set; }
53-
54-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter)]
55-
[ValidateNotNullOrEmpty]
56-
public JobStatus? Status { get; set; }
57-
5858
public override void ExecuteCmdlet()
5959
{
6060
ExecutionBlock(() =>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public class GetAzureRmRecoveryServicesJobDetails : RecoveryServicesBackupCmdlet
2424
protected const string IdFilterSet = "IdFilterSet";
2525
protected const string JobFilterSet = "JobFilterSet";
2626

27-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobIdFilter, ParameterSetName = IdFilterSet)]
28-
[ValidateNotNullOrEmpty]
29-
public string JobId { get; set; }
30-
31-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobFilter, ParameterSetName = JobFilterSet)]
27+
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobFilter, ParameterSetName = JobFilterSet, Position = 1)]
3228
[ValidateNotNull]
3329
public AzureRmRecoveryServicesJobBase Job { get; set; }
3430

31+
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobIdFilter, ParameterSetName = IdFilterSet, Position = 2)]
32+
[ValidateNotNullOrEmpty]
33+
public string JobId { get; set; }
34+
3535
public override void ExecuteCmdlet()
3636
{
3737
ExecutionBlock(() =>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public class StopAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
2929
protected const string IdFilterSet = "IdFilterSet";
3030
protected const string JobFilterSet = "JobFilterSet";
3131

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

36-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.StopJobJobIdFilter, ParameterSetName = IdFilterSet)]
36+
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.StopJobJobIdFilter, ParameterSetName = IdFilterSet, Position = 2)]
3737
[ValidateNotNull]
3838
public string JobId { get; set; }
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
[Cmdlet("Wait", "AzureRmRecoveryServicesJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
2626
public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
2727
{
28-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter, ValueFromPipeline = true)]
28+
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter, ValueFromPipeline = true, Position = 1)]
2929
[ValidateNotNull]
3030
public object Job { get; set; }
3131

32-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.WaitJobTimeoutFilter)]
32+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.WaitJobTimeoutFilter, Position = 2)]
3333
public long? Timeout { get; set; }
3434

3535
public override void ExecuteCmdlet()

0 commit comments

Comments
 (0)