Skip to content

Commit 6a7fc3a

Browse files
avneeshraiusitavneeshraiusit
committed
Representing piped parameter as InputObject in same noun cmdlets.
1 parent 96a728e commit 6a7fc3a

File tree

42 files changed

+306
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+306
-281
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2499,6 +2499,9 @@
24992499
<Component Id="cmp79AD0BD648ECD6B9E118912F0097D63F" Guid="*">
25002500
<File Id="fil8AD485A19F1A04EBE0E6AF4DB8E653FE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.dll" />
25012501
</Component>
2502+
<Component Id="cmpFB4781DB59F0975FBF93CC797F221D90" Guid="*">
2503+
<File Id="filB5F7976DDECF083A0FCEC4759BCA4529" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.dll-Help.xml" />
2504+
</Component>
25022505
<Component Id="cmp6E2F88D1764A574319CF2A283B1BB061" Guid="*">
25032506
<File Id="fil472AC75B1C795505076D7090E5587075" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.SiteRecovery\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
25042507
</Component>
@@ -6366,6 +6369,7 @@
63666369
<ComponentRef Id="cmpF05650ADBDFC90B4E8883182ADC74A00" />
63676370
<ComponentRef Id="cmpCF0A8990FBA292F928410AF12C50A478" />
63686371
<ComponentRef Id="cmp79AD0BD648ECD6B9E118912F0097D63F" />
6372+
<ComponentRef Id="cmpFB4781DB59F0975FBF93CC797F221D90" />
63696373
<ComponentRef Id="cmp6E2F88D1764A574319CF2A283B1BB061" />
63706374
<ComponentRef Id="cmp9ED47E4AD4840E8BB5DD6967E5291DD2" />
63716375
<ComponentRef Id="cmpCF116CBA995A8D25D06E5CB51EA5E473" />

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Fabrics/RemoveAzureRmRecoveryServicesAsrFabric.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public class RemoveAzureRmRecoveryServicesAsrFabric : SiteRecoveryCmdletBase
3434
Mandatory = true,
3535
ValueFromPipeline = true)]
3636
[ValidateNotNullOrEmpty]
37-
public ASRFabric Fabric { get; set; }
37+
[Alias("Fabric")]
38+
public ASRFabric InputObject { get; set; }
3839

3940
/// <summary>
4041
/// Gets or sets switch parameter. On passing, command does not ask for confirmation.
@@ -49,18 +50,18 @@ public override void ExecuteSiteRecoveryCmdlet()
4950
{
5051
base.ExecuteSiteRecoveryCmdlet();
5152

52-
if (ShouldProcess(Fabric.FriendlyName,
53+
if (ShouldProcess(InputObject.FriendlyName,
5354
VerbsCommon.Remove))
5455
{
5556
PSSiteRecoveryLongRunningOperation response;
5657

5758
if (!Force.IsPresent)
5859
{
59-
response = RecoveryServicesClient.DeleteAzureSiteRecoveryFabric(Fabric.Name);
60+
response = RecoveryServicesClient.DeleteAzureSiteRecoveryFabric(InputObject.Name);
6061
}
6162
else
6263
{
63-
response = RecoveryServicesClient.PurgeAzureSiteRecoveryFabric(Fabric.Name);
64+
response = RecoveryServicesClient.PurgeAzureSiteRecoveryFabric(InputObject.Name);
6465
}
6566

6667
var jobResponse =

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Job/RestartAzureRmRecoveryServicesAsrJob.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public class RestartAzureRmRecoveryServicesAsrJob : SiteRecoveryCmdletBase
4141
Mandatory = true,
4242
ValueFromPipeline = true)]
4343
[ValidateNotNullOrEmpty]
44-
public ASRJob Job { get; set; }
44+
[Alias("Job")]
45+
public ASRJob InputObject { get; set; }
4546

4647
/// <summary>
4748
/// ProcessRecord of the command.
@@ -53,7 +54,7 @@ public override void ExecuteSiteRecoveryCmdlet()
5354
switch (ParameterSetName)
5455
{
5556
case ASRParameterSets.ByObject:
56-
Name = Job.Name;
57+
Name = InputObject.Name;
5758
RestartByName();
5859
break;
5960

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Job/ResumeAzureRmRecoveryServicesAsrJob.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public class ResumeAzureRmRecoveryServicesAsrJob : SiteRecoveryCmdletBase
4242
Mandatory = true,
4343
ValueFromPipeline = true)]
4444
[ValidateNotNullOrEmpty]
45-
public ASRJob Job { get; set; }
45+
[Alias("Job")]
46+
public ASRJob InputObject { get; set; }
4647

4748
/// <summary>
4849
/// Gets or sets job comments.
@@ -61,7 +62,7 @@ public override void ExecuteSiteRecoveryCmdlet()
6162
switch (ParameterSetName)
6263
{
6364
case ASRParameterSets.ByObject:
64-
Name = Job.Name;
65+
Name = InputObject.Name;
6566
ResumesByName();
6667
break;
6768

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Job/StopAzureRmRecoveryServicesAsrJob.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public class StopAzureRmRecoveryServicesAsrJob : SiteRecoveryCmdletBase
4141
Mandatory = true,
4242
ValueFromPipeline = true)]
4343
[ValidateNotNullOrEmpty]
44-
public ASRJob Job { get; set; }
44+
[Alias("Job")]
45+
public ASRJob InputObject { get; set; }
4546

4647
/// <summary>
4748
/// ProcessRecord of the command.
@@ -53,7 +54,7 @@ public override void ExecuteSiteRecoveryCmdlet()
5354
switch (ParameterSetName)
5455
{
5556
case ASRParameterSets.ByObject:
56-
Name = Job.Name;
57+
Name = InputObject.Name;
5758
StopByName();
5859
break;
5960

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Network/RemoveAzureRmRecoveryServicesAsrNetworkMapping.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public class RemoveAzureRmRecoveryServicesAsrNetworkMapping : SiteRecoveryCmdlet
3131
[Parameter(Mandatory = true,
3232
ValueFromPipeline = true)]
3333
[ValidateNotNullOrEmpty]
34-
public ASRNetworkMapping NetworkMapping { get; set; }
34+
[Alias("NetworkMapping")]
35+
public ASRNetworkMapping InputObject { get; set; }
3536

3637
/// <summary>
3738
/// ProcessRecord of the command.
@@ -41,11 +42,11 @@ public override void ExecuteSiteRecoveryCmdlet()
4142
base.ExecuteSiteRecoveryCmdlet();
4243

4344
var response = RecoveryServicesClient.RemoveAzureSiteRecoveryNetworkMapping(
44-
Utilities.GetValueFromArmId(NetworkMapping.ID,
45+
Utilities.GetValueFromArmId(InputObject.ID,
4546
ARMResourceTypeConstants.ReplicationFabrics),
46-
Utilities.GetValueFromArmId(NetworkMapping.ID,
47+
Utilities.GetValueFromArmId(InputObject.ID,
4748
"replicationNetworks"),
48-
Utilities.GetValueFromArmId(NetworkMapping.ID,
49+
Utilities.GetValueFromArmId(InputObject.ID,
4950
"replicationNetworkMappings"));
5051

5152
var jobResponse =

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Network/UpdateAzureRmRecoveryServicesAsrNetworkMapping.cs

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ public class UpdateAzureRmRecoveryServicesAsrNetworkMapping : SiteRecoveryCmdlet
3030
/// Gets or sets Azure VM Network Id.
3131
/// </summary>
3232
[Parameter(ParameterSetName = ASRParameterSets.ById,
33-
Mandatory = true)]
33+
Mandatory = true,
34+
ValueFromPipeline = true)]
3435
[Parameter(ParameterSetName = ASRParameterSets.ByNetworkObject,
35-
Mandatory = true)]
36+
Mandatory = true,
37+
ValueFromPipeline = true)]
3638
[ValidateNotNullOrEmpty]
37-
public ASRNetworkMapping Mapping { get; set; }
39+
[Alias("NetworkMapping")]
40+
public ASRNetworkMapping InputObject { get; set; }
3841

3942
/// <summary>
4043
/// Gets or sets Recovery Network object.
@@ -65,7 +68,7 @@ public override void ExecuteSiteRecoveryCmdlet()
6568
UpdateEnterpriseToEnterpriseNetworkMapping();
6669
break;
6770
case ASRParameterSets.ById:
68-
if (Mapping.ID.Contains(ARMResourceTypeConstants.AzureNetwork))
71+
if (InputObject.ID.Contains(ARMResourceTypeConstants.AzureNetwork))
6972
{
7073
UpdateAzureToAzureNetworkMapping();
7174
}
@@ -93,11 +96,11 @@ private void UpdateEnterpriseToEnterpriseNetworkMapping()
9396
}
9497
};
9598
var response = RecoveryServicesClient.UpdateAzureSiteRecoveryNetworkMapping(
96-
Utilities.GetValueFromArmId(Mapping.PrimaryNetworkId,
99+
Utilities.GetValueFromArmId(InputObject.PrimaryNetworkId,
97100
ARMResourceTypeConstants.ReplicationFabrics),
98-
Utilities.GetValueFromArmId(Mapping.PrimaryNetworkId,
101+
Utilities.GetValueFromArmId(InputObject.PrimaryNetworkId,
99102
ARMResourceTypeConstants.ReplicationNetworks),
100-
Mapping.Name,
103+
InputObject.Name,
101104
input);
102105

103106
var jobResponse =
@@ -126,11 +129,11 @@ private void UpdateEnterpriseToAzureNetworkMapping()
126129
}
127130
};
128131
var response = RecoveryServicesClient.UpdateAzureSiteRecoveryNetworkMapping(
129-
Utilities.GetValueFromArmId(Mapping.PrimaryNetworkId,
132+
Utilities.GetValueFromArmId(InputObject.PrimaryNetworkId,
130133
ARMResourceTypeConstants.ReplicationFabrics),
131-
Utilities.GetValueFromArmId(Mapping.PrimaryNetworkId,
134+
Utilities.GetValueFromArmId(InputObject.PrimaryNetworkId,
132135
ARMResourceTypeConstants.ReplicationNetworks),
133-
Mapping.Name,
136+
InputObject.Name,
134137
input);
135138

136139
var jobResponse =
@@ -153,19 +156,19 @@ private void UpdateAzureToAzureNetworkMapping()
153156
{
154157
Properties = new UpdateNetworkMappingInputProperties
155158
{
156-
RecoveryFabricName = Mapping.RecoveryFabricFriendlyName,
159+
RecoveryFabricName = InputObject.RecoveryFabricFriendlyName,
157160
RecoveryNetworkId = RecoveryAzureNetworkId,
158161
FabricSpecificDetails =
159162
new AzureToAzureUpdateNetworkMappingInput
160163
{
161-
PrimaryNetworkId = Mapping.PrimaryNetworkId
164+
PrimaryNetworkId = InputObject.PrimaryNetworkId
162165
}
163166
}
164167
};
165168
var response = RecoveryServicesClient.UpdateAzureSiteRecoveryNetworkMapping(
166-
Mapping.PrimaryFabricFriendlyName,
169+
InputObject.PrimaryFabricFriendlyName,
167170
ARMResourceTypeConstants.AzureNetwork,
168-
Mapping.Name,
171+
InputObject.Name,
169172
input);
170173

171174
var jobResponse =

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Policy/RemoveAzureRmRecoveryServicesAsrPolicy.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public class RemoveAzureRmRecoveryServicesAsrPolicy : SiteRecoveryCmdletBase
3030
/// </summary>
3131
[Parameter(Mandatory = true,
3232
ValueFromPipeline = true)]
33-
public ASRPolicy Policy { get; set; }
33+
[Alias("Policy")]
34+
public ASRPolicy InputObject { get; set; }
3435

3536
/// <summary>
3637
/// ProcessRecord of the command.
@@ -39,7 +40,7 @@ public override void ExecuteSiteRecoveryCmdlet()
3940
{
4041
base.ExecuteSiteRecoveryCmdlet();
4142

42-
var responseBlue = RecoveryServicesClient.DeletePolicy(Policy.Name);
43+
var responseBlue = RecoveryServicesClient.DeletePolicy(InputObject.Name);
4344

4445
var jobResponseBlue =
4546
RecoveryServicesClient.GetAzureSiteRecoveryJobDetails(

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Policy/UpdateAzureRmRecoveryServicesAsrPolicy.cs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public class UpdateAzureRmRecoveryServicesAsrPolicy : SiteRecoveryCmdletBase
3434
/// </summary>
3535
[Parameter(Mandatory = true,
3636
ValueFromPipeline = true)]
37-
public ASRPolicy Policy { get; set; }
37+
[Alias("Policy")]
38+
public ASRPolicy InputObject { get; set; }
3839

3940
/// <summary>
4041
/// Gets or sets a value for Replication Method of the Policy.
@@ -134,18 +135,18 @@ public override void ExecuteSiteRecoveryCmdlet()
134135
{
135136
base.ExecuteSiteRecoveryCmdlet();
136137

137-
if (string.Compare(Policy.ReplicationProvider,
138+
if (string.Compare(InputObject.ReplicationProvider,
138139
Constants.HyperVReplica2012,
139140
StringComparison.OrdinalIgnoreCase) ==
140141
0 ||
141-
string.Compare(Policy.ReplicationProvider,
142+
string.Compare(InputObject.ReplicationProvider,
142143
Constants.HyperVReplica2012R2,
143144
StringComparison.OrdinalIgnoreCase) ==
144145
0)
145146
{
146147
EnterpriseToEnterprisePolicyObject();
147148
}
148-
else if (string.Compare(Policy.ReplicationProvider,
149+
else if (string.Compare(InputObject.ReplicationProvider,
149150
Constants.HyperVReplicaAzure,
150151
StringComparison.OrdinalIgnoreCase) ==
151152
0)
@@ -159,22 +160,22 @@ public override void ExecuteSiteRecoveryCmdlet()
159160
/// </summary>
160161
private void EnterpriseToEnterprisePolicyObject()
161162
{
162-
if (string.Compare(Policy.ReplicationProvider,
163+
if (string.Compare(InputObject.ReplicationProvider,
163164
Constants.HyperVReplica2012,
164165
StringComparison.OrdinalIgnoreCase) !=
165166
0 &&
166-
string.Compare(Policy.ReplicationProvider,
167+
string.Compare(InputObject.ReplicationProvider,
167168
Constants.HyperVReplica2012R2,
168169
StringComparison.OrdinalIgnoreCase) !=
169170
0)
170171
{
171172
throw new InvalidOperationException(string.Format(
172173
Resources.IncorrectReplicationProvider,
173-
Policy.ReplicationProvider));
174+
InputObject.ReplicationProvider));
174175
}
175176

176177
var replicationProviderSettings =
177-
Policy.ReplicationProviderSettings as ASRHyperVReplicaPolicyDetails;
178+
InputObject.ReplicationProviderSettings as ASRHyperVReplicaPolicyDetails;
178179

179180
replicationMethod =
180181
MyInvocation.BoundParameters.ContainsKey(
@@ -232,7 +233,7 @@ private void EnterpriseToEnterprisePolicyObject()
232233

233234
var updatePolicyProperties = new UpdatePolicyInputProperties();
234235

235-
if (string.Compare(Policy.ReplicationProvider,
236+
if (string.Compare(InputObject.ReplicationProvider,
236237
Constants.HyperVReplica2012,
237238
StringComparison.OrdinalIgnoreCase) ==
238239
0)
@@ -270,7 +271,7 @@ private void EnterpriseToEnterprisePolicyObject()
270271

271272
var updatePolicyInput = new UpdatePolicyInput {Properties = updatePolicyProperties};
272273

273-
var responseBlue = RecoveryServicesClient.UpdatePolicy(Policy.Name,
274+
var responseBlue = RecoveryServicesClient.UpdatePolicy(InputObject.Name,
274275
updatePolicyInput);
275276

276277
var jobResponseBlue =
@@ -285,18 +286,18 @@ private void EnterpriseToEnterprisePolicyObject()
285286
/// </summary>
286287
private void EnterpriseToAzurePolicyObject()
287288
{
288-
if (string.Compare(Policy.ReplicationProvider,
289+
if (string.Compare(InputObject.ReplicationProvider,
289290
Constants.HyperVReplicaAzure,
290291
StringComparison.OrdinalIgnoreCase) !=
291292
0)
292293
{
293294
throw new InvalidOperationException(string.Format(
294295
Resources.IncorrectReplicationProvider,
295-
Policy.ReplicationProvider));
296+
InputObject.ReplicationProvider));
296297
}
297298

298299
var replicationProviderSettings =
299-
Policy.ReplicationProviderSettings as ASRHyperVReplicaAzurePolicyDetails;
300+
InputObject.ReplicationProviderSettings as ASRHyperVReplicaAzurePolicyDetails;
300301

301302
replicationFrequencyInSeconds =
302303
MyInvocation.BoundParameters.ContainsKey(
@@ -355,7 +356,7 @@ private void EnterpriseToAzurePolicyObject()
355356

356357
var updatePolicyInput = new UpdatePolicyInput {Properties = updatePolicyProperties};
357358

358-
var response = RecoveryServicesClient.UpdatePolicy(Policy.Name,
359+
var response = RecoveryServicesClient.UpdatePolicy(InputObject.Name,
359360
updatePolicyInput);
360361

361362
var jobResponse =

‎src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/ProtectionContainerMapping/RemoveAzureRmRecoveryServicesAsrProtectionContainerMapping.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class RemoveAzureRmRecoveryServicesAsrProtectionContainerMapping : SiteRe
3535
Mandatory = true,
3636
ValueFromPipeline = true)]
3737
[ValidateNotNullOrEmpty]
38-
public ASRProtectionContainerMapping ProtectionContainerMapping { get; set; }
38+
[Alias("ProtectionContainerMapping")]
39+
public ASRProtectionContainerMapping InputObject { get; set; }
3940

4041
/// <summary>
4142
/// Gets or sets switch parameter. On passing, command does not ask for confirmation.
@@ -50,7 +51,7 @@ public override void ExecuteSiteRecoveryCmdlet()
5051
{
5152
base.ExecuteSiteRecoveryCmdlet();
5253

53-
if (ShouldProcess(ProtectionContainerMapping.Name,
54+
if (ShouldProcess(InputObject.Name,
5455
VerbsCommon.Remove))
5556
{
5657
PSSiteRecoveryLongRunningOperation response = null;
@@ -66,21 +67,21 @@ public override void ExecuteSiteRecoveryCmdlet()
6667
new RemoveProtectionContainerMappingInput {Properties = inputProperties};
6768

6869
response = RecoveryServicesClient.UnConfigureProtection(
69-
Utilities.GetValueFromArmId(ProtectionContainerMapping.ID,
70+
Utilities.GetValueFromArmId(InputObject.ID,
7071
ARMResourceTypeConstants.ReplicationFabrics),
71-
Utilities.GetValueFromArmId(ProtectionContainerMapping.ID,
72+
Utilities.GetValueFromArmId(InputObject.ID,
7273
ARMResourceTypeConstants.ReplicationProtectionContainers),
73-
ProtectionContainerMapping.Name,
74+
InputObject.Name,
7475
input);
7576
}
7677
else
7778
{
7879
response = RecoveryServicesClient.PurgeCloudMapping(Utilities.GetValueFromArmId(
79-
ProtectionContainerMapping.ID,
80+
InputObject.ID,
8081
ARMResourceTypeConstants.ReplicationFabrics),
81-
Utilities.GetValueFromArmId(ProtectionContainerMapping.ID,
82+
Utilities.GetValueFromArmId(InputObject.ID,
8283
ARMResourceTypeConstants.ReplicationProtectionContainers),
83-
ProtectionContainerMapping.Name);
84+
InputObject.Name);
8485
}
8586

8687
var jobResponse =

0 commit comments

Comments
 (0)