Skip to content

Commit ddf5c83

Browse files
pikumarmsft16pikumarmsft16
committed
Merge branch 'dev1' into pikumar-dev1
# Conflicts: # src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs # src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll
2 parents 811432b + c65bf87 commit ddf5c83

File tree

27 files changed

+373
-213
lines changed

27 files changed

+373
-213
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@
204204
<Component Id="cmp048B605B1072F4A5467F2AFFD8ED2459" Guid="*">
205205
<File Id="fil38FE506241BEC2CA3B34645613B821F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll" />
206206
</Component>
207+
<Component Id="cmpB2F2FF5F057BDE656891B43C18ADF020" Guid="*">
208+
<File Id="fil952FAF0371C7CCC373DBDF330DB18A87" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.psd1" />
209+
</Component>
207210
<Component Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" Guid="*">
208211
<File Id="filE0954BDD89FA012B32E270ADA2F66DD8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.xml" />
209212
</Component>
@@ -2001,92 +2004,6 @@
20012004
<File Id="fil3A29806CC321EA39756A69909C112925" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Primitives.dll" />
20022005
</Component>
20032006
</Directory>
2004-
<Directory Id="dir4B5D5A50B55B6D96C02DC2573A68955C" Name="AzureRM.RecoveryServices.Backup">
2005-
<Component Id="cmp131A9DE83A67006D51F1314A42E399CA" Guid="*">
2006-
<File Id="filA2C0D97A8033046D96249BA12C24D9D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.Backup.psd1" />
2007-
</Component>
2008-
<Component Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" Guid="*">
2009-
<File Id="filB0E96893813842B67380A6863ABBCC0D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.psd1" />
2010-
</Component>
2011-
<Component Id="cmpB35FF47D728C871816F14A3529260DE9" Guid="*">
2012-
<File Id="fil4BCDE7803B14A0BC88A83E82379716A7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Hyak.Common.dll" />
2013-
</Component>
2014-
<Component Id="cmp99A277F4A4EF20D7BFBB171691A4B7E7" Guid="*">
2015-
<File Id="fil193C22E9D7D487844F6F0FD30BB8FB26" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.ApplicationInsights.dll" />
2016-
</Component>
2017-
<Component Id="cmp1675F88279F58B72A180AF1411111337" Guid="*">
2018-
<File Id="fil368A68C98DD3F0B808B02BBF24EBB9AC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.Common.Authentication.dll" />
2019-
</Component>
2020-
<Component Id="cmp787B2B1E92B4AEF145134D74C17913C9" Guid="*">
2021-
<File Id="fil4414EC37DBB3B801C0176E172A8566FD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
2022-
</Component>
2023-
<Component Id="cmpE5C4E7687DB1C6113A30F1D9CE41182F" Guid="*">
2024-
<File Id="fil1DF400D4DB252DE79904817997C7CB41" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.ARM.dll-help.xml" />
2025-
</Component>
2026-
<Component Id="cmpB5BF9FBFFC4EDD83B9F7135CF42CB617" Guid="*">
2027-
<File Id="fil64AAA98F94DB6985D3A60FF7570C5E4A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.dll" />
2028-
</Component>
2029-
<Component Id="cmp7E42CC4AEA15FEF46E621AD38CC09F5A" Guid="*">
2030-
<File Id="filB3BB12CA661C1C8E6E7BE93BD77D781D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml" />
2031-
</Component>
2032-
<Component Id="cmpB7B864E9C70EE65B799C79119DF7E80B" Guid="*">
2033-
<File Id="fil53BEB99E0373F87AA8C1DE1E39F13115" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers.dll" />
2034-
</Component>
2035-
<Component Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" Guid="*">
2036-
<File Id="filCA9A0EEBDB33D088D4D0EB9555189CD6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter.dll" />
2037-
</Component>
2038-
<Component Id="cmp8826130AB84A23A8748B2E58087F1733" Guid="*">
2039-
<File Id="filBDEE1F034CEDF43D3B10E1DCA9DF81C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Logger.dll" />
2040-
</Component>
2041-
<Component Id="cmp705D3AFB5E86339823E569C4645A139F" Guid="*">
2042-
<File Id="filF87916ADE8086D552AFBF5F86147DB57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll" />
2043-
</Component>
2044-
<Component Id="cmp3CBA7972F4711484D7FFF19457023268" Guid="*">
2045-
<File Id="filFEB151053DDC35E6643F363B07EC1EE3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Providers.dll" />
2046-
</Component>
2047-
<Component Id="cmpDD61A35D79AF0DB08D533DDD646150DC" Guid="*">
2048-
<File Id="filF23BA348008E142BB0CEBEBDBD6F0B09" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
2049-
</Component>
2050-
<Component Id="cmp577E28EE57A416E3052CEE1BD21E5990" Guid="*">
2051-
<File Id="filC0711EC11D3FDA55E7F0015642F4BBC2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Common.dll" />
2052-
</Component>
2053-
<Component Id="cmp403248FE1CECDB2218740975E268E81C" Guid="*">
2054-
<File Id="fil6311352FB4850E9DAC49E5FCCA907E9B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Common.NetFramework.dll" />
2055-
</Component>
2056-
<Component Id="cmp16B849AA6669D83462B54D42D739CCCC" Guid="*">
2057-
<File Id="filE7E1056326FD5C43C9A9CDEBA5395825" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServices.dll" />
2058-
</Component>
2059-
<Component Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" Guid="*">
2060-
<File Id="filBF5932AC23F8EBCB6F98F17FF84774EF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
2061-
</Component>
2062-
<Component Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" Guid="*">
2063-
<File Id="fil9CAF7845821BBD039F828C617305D835" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2064-
</Component>
2065-
<Component Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" Guid="*">
2066-
<File Id="filDFC93A6AA2A808957B249CC88C7D6EE5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
2067-
</Component>
2068-
<Component Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" Guid="*">
2069-
<File Id="filA708CDDEB8C8A8363E22F4C83953E14E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.dll" />
2070-
</Component>
2071-
<Component Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" Guid="*">
2072-
<File Id="fil4E1010AEBDF69B9DF75CE473426C64B7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Threading.Tasks.dll" />
2073-
</Component>
2074-
<Component Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" Guid="*">
2075-
<File Id="filF61F62275153BB9F26EB1521CB9F8499" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Commands.Common.dll" />
2076-
</Component>
2077-
<Component Id="cmpF9EE1FA96DC6D8D178B61CD12160F541" Guid="*">
2078-
<File Id="fil60C54B33813267CA413696B2DA8D7864" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Management.dll" />
2079-
</Component>
2080-
<Component Id="cmp829F9EDD9A1D61A93ABE0F823CA9C181" Guid="*">
2081-
<File Id="fil187A39E94510EE8FA451727EFDD1793C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.WindowsAzure.Management.Scheduler.dll" />
2082-
</Component>
2083-
<Component Id="cmp517D253BF8B4A6D2010F79CA7DF1BEF5" Guid="*">
2084-
<File Id="fil0C3EEB7F44300C37492FACA1F361D1C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Newtonsoft.Json.dll" />
2085-
</Component>
2086-
<Component Id="cmp91B9EAC62A0387B3AF8AD38F521C37B2" Guid="*">
2087-
<File Id="fil5512E9FE988FAF589373CE2C48F046FF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Security.Cryptography.dll" />
2088-
</Component>
2089-
</Directory>
20902007
<Directory Id="dir81EE6B6C66E21DBFAFE07FA058F415D6" Name="AzureRM.RedisCache">
20912008
<Component Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" Guid="*">
20922009
<File Id="fil1A611C57F01D0929B21DD9483DAF7EE0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\AzureRM.RedisCache.psd1" />
@@ -5125,6 +5042,7 @@
51255042
<ComponentRef Id="cmpFDFB38E21048DD505BCAD31F5136992E" />
51265043
<ComponentRef Id="cmpC2439F65706917CA4AABD3AF6AFB856A" />
51275044
<ComponentRef Id="cmp048B605B1072F4A5467F2AFFD8ED2459" />
5045+
<ComponentRef Id="cmpB2F2FF5F057BDE656891B43C18ADF020" />
51285046
<ComponentRef Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" />
51295047
<ComponentRef Id="cmpA2F17B479BD0FE1A81AED68A6C03B7A0" />
51305048
<ComponentRef Id="cmp4E983C9ECBC2D4A29376A70418BE5E2B" />
@@ -5711,34 +5629,6 @@
57115629
<ComponentRef Id="cmp6507BFAC437859C861A9F8D0535A62ED" />
57125630
<ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
57135631
<ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
5714-
<ComponentRef Id="cmp131A9DE83A67006D51F1314A42E399CA" />
5715-
<ComponentRef Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" />
5716-
<ComponentRef Id="cmpB35FF47D728C871816F14A3529260DE9" />
5717-
<ComponentRef Id="cmp99A277F4A4EF20D7BFBB171691A4B7E7" />
5718-
<ComponentRef Id="cmp1675F88279F58B72A180AF1411111337" />
5719-
<ComponentRef Id="cmp787B2B1E92B4AEF145134D74C17913C9" />
5720-
<ComponentRef Id="cmpE5C4E7687DB1C6113A30F1D9CE41182F" />
5721-
<ComponentRef Id="cmpB5BF9FBFFC4EDD83B9F7135CF42CB617" />
5722-
<ComponentRef Id="cmp7E42CC4AEA15FEF46E621AD38CC09F5A" />
5723-
<ComponentRef Id="cmpB7B864E9C70EE65B799C79119DF7E80B" />
5724-
<ComponentRef Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" />
5725-
<ComponentRef Id="cmp8826130AB84A23A8748B2E58087F1733" />
5726-
<ComponentRef Id="cmp705D3AFB5E86339823E569C4645A139F" />
5727-
<ComponentRef Id="cmp3CBA7972F4711484D7FFF19457023268" />
5728-
<ComponentRef Id="cmpDD61A35D79AF0DB08D533DDD646150DC" />
5729-
<ComponentRef Id="cmp577E28EE57A416E3052CEE1BD21E5990" />
5730-
<ComponentRef Id="cmp403248FE1CECDB2218740975E268E81C" />
5731-
<ComponentRef Id="cmp16B849AA6669D83462B54D42D739CCCC" />
5732-
<ComponentRef Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" />
5733-
<ComponentRef Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" />
5734-
<ComponentRef Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" />
5735-
<ComponentRef Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" />
5736-
<ComponentRef Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" />
5737-
<ComponentRef Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" />
5738-
<ComponentRef Id="cmpF9EE1FA96DC6D8D178B61CD12160F541" />
5739-
<ComponentRef Id="cmp829F9EDD9A1D61A93ABE0F823CA9C181" />
5740-
<ComponentRef Id="cmp517D253BF8B4A6D2010F79CA7DF1BEF5" />
5741-
<ComponentRef Id="cmp91B9EAC62A0387B3AF8AD38F521C37B2" />
57425632
<ComponentRef Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" />
57435633
<ComponentRef Id="cmp5EF3051C386C8DAA602E772A7C258726" />
57445634
<ComponentRef Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" />

‎src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.4'
12+
ModuleVersion = '1.0.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '3d444bee-6742-4ce2-b573-dfd1b7c4144c'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()
@@ -85,6 +85,27 @@ ModuleList = @()
8585
FileList = @()
8686

8787
# Private data to pass to the module specified in ModuleToProcess
88-
PrivateData = ''
88+
PrivateData = @{
8989

90-
}
90+
PSData = @{
91+
92+
# Tags applied to this module. These help with module discovery in online galleries.
93+
# Tags = @()
94+
95+
# A URL to the license for this module.
96+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
97+
98+
# A URL to the main website for this project.
99+
ProjectUri = 'https://github.com/Azure/azure-powershell'
100+
101+
# A URL to an icon representing this module.
102+
# IconUri = ''
103+
104+
# ReleaseNotes of this module
105+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
106+
107+
} # End of PSData hashtable
108+
109+
} # End of PrivateData hashtable
110+
111+
}

‎src/ResourceManager/RecoveryServices.Backup/CmdletParameterHelpMessages.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ internal static class RecoveryPoint
8787
internal static class RestoreDisk
8888
{
8989
public const string RecoveryPoint = "Recovery point objected to be restored";
90-
public const string StorageAccountName = "Storage account name where the disk need to be recovered";
90+
public const string StorageAccountName = "Storage account name where the disk need to be recovered";
91+
public const string StorageAccountResourceGroupName = "Resource group name of Storage account name where the disk need to be recovered";
9192
}
9293
}
9394
}

‎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(() =>

0 commit comments

Comments
 (0)