Skip to content

Commit 4a7266b

Browse files
committed
More changes
1 parent 2f175d9 commit 4a7266b

File tree

9 files changed

+21
-20
lines changed

9 files changed

+21
-20
lines changed

src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/EndpointTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function Test-DeleteEndpoint
4343

4444
TestSetup-AddEndpoint $endpointName $profile
4545

46-
Remove-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -Profile $profile
46+
Remove-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile
4747

4848
Assert-AreEqual 0 $profile.Endpoints.Count
4949
}

src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/ProfileTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function Test-ProfileCrud
3636

3737
$createdProfile.TrafficRoutingMethod = "Priority"
3838

39-
$updatedProfile = Set-AzureTrafficManagerProfile -Profile $createdProfile
39+
$updatedProfile = Set-AzureTrafficManagerProfile -TrafficManagerProfile $createdProfile
4040

4141
Assert-NotNull $updatedProfile
4242
Assert-AreEqual $profileName $updatedProfile.Name
@@ -86,7 +86,7 @@ function Test-CreateDeleteUsingProfile
8686
Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
8787
Assert-AreEqual "Performance" $createdProfile.TrafficRoutingMethod
8888

89-
Remove-AzureTrafficManagerProfile -Profile $createdProfile -Force
89+
Remove-AzureTrafficManagerProfile -TrafficManagerProfile $createdProfile -Force
9090

9191
Assert-Throws { Get-AzureTrafficManagerProfile -Name $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "ResourceNotFound: Resource not found."
9292
}

src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/UnitTests/AddAzureTrafficManagerEndpointConfigTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void AddAzureTrafficManagerEndpointConfig_ThrowsExceptionIfAddingExisting
2828
{
2929
var cmdlet = new AddAzureTrafficManagerEndpointConfig
3030
{
31-
Profile = new TrafficManagerProfile
31+
TrafficManagerProfile = new TrafficManagerProfile
3232
{
3333
Endpoints = new List<Endpoint>
3434
{

src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/UnitTests/RemoveAzureTrafficManagerEndpointConfigTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void RemoveAzureTrafficManagerEndpointConfig_ThrowsExceptionWhenNullEndpo
2929
{
3030
var cmdlet = new RemoveAzureTrafficManagerEndpointConfig
3131
{
32-
Profile = new TrafficManagerProfile(),
32+
TrafficManagerProfile = new TrafficManagerProfile(),
3333
EndpointName = "Name"
3434
};
3535

@@ -43,7 +43,7 @@ public void RemoveAzureTrafficManagerEndpointConfig_ThrowsExceptionWhenNoEndpoin
4343
{
4444
var cmdlet = new RemoveAzureTrafficManagerEndpointConfig
4545
{
46-
Profile = new TrafficManagerProfile
46+
TrafficManagerProfile = new TrafficManagerProfile
4747
{
4848
Endpoints = new List<Endpoint>
4949
{

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/AddAzureTrafficManagerEndpointConfig.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class AddAzureTrafficManagerEndpointConfig : TrafficManagerBaseCmdlet
3232

3333
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The profile.")]
3434
[ValidateNotNullOrEmpty]
35-
public new TrafficManagerProfile Profile { get; set; }
35+
public TrafficManagerProfile TrafficManagerProfile { get; set; }
3636

3737
[Parameter(Mandatory = true, HelpMessage = "The type of the endpoint.")]
3838
[ValidateSet(Constants.AzureEndpoint, Constants.ExternalEndpoint, Constants.NestedEndpoint, IgnoreCase = false)]
@@ -62,17 +62,17 @@ public class AddAzureTrafficManagerEndpointConfig : TrafficManagerBaseCmdlet
6262

6363
public override void ExecuteCmdlet()
6464
{
65-
if (this.Profile.Endpoints == null)
65+
if (this.TrafficManagerProfile.Endpoints == null)
6666
{
67-
this.Profile.Endpoints = new List<Endpoint>();
67+
this.TrafficManagerProfile.Endpoints = new List<Endpoint>();
6868
}
6969

70-
if (this.Profile.Endpoints.Any(endpoint => string.Equals(this.EndpointName, endpoint.Name)))
70+
if (this.TrafficManagerProfile.Endpoints.Any(endpoint => string.Equals(this.EndpointName, endpoint.Name)))
7171
{
7272
throw new PSArgumentException(string.Format(ProjectResources.Error_AddExistingEndpoint, this.EndpointName));
7373
}
7474

75-
this.Profile.Endpoints.Add(
75+
this.TrafficManagerProfile.Endpoints.Add(
7676
new Endpoint
7777
{
7878
Name = this.EndpointName,
@@ -85,7 +85,7 @@ public override void ExecuteCmdlet()
8585
});
8686

8787
this.WriteVerbose(ProjectResources.Success);
88-
this.WriteObject(this.Profile);
88+
this.WriteObject(this.TrafficManagerProfile);
8989
}
9090
}
9191
}

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/RemoveAzureTrafficManagerEndpointConfig.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ public class RemoveAzureTrafficManagerEndpointConfig : TrafficManagerBaseCmdlet
2929

3030
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The profile.")]
3131
[ValidateNotNullOrEmpty]
32-
public new TrafficManagerProfile Profile { get; set; }
32+
public TrafficManagerProfile TrafficManagerProfile { get; set; }
3333

3434
public override void ExecuteCmdlet()
3535
{
36-
if (this.Profile.Endpoints == null)
36+
if (this.TrafficManagerProfile.Endpoints == null)
3737
{
3838
throw new PSArgumentException(string.Format(ProjectResources.Error_EndpointNotFound, this.EndpointName));
3939
}
4040

41-
int endpointsRemoved = this.Profile.Endpoints.RemoveAll(endpoint => string.Equals(this.EndpointName, endpoint.Name));
41+
int endpointsRemoved = this.TrafficManagerProfile.Endpoints.RemoveAll(endpoint => string.Equals(this.EndpointName, endpoint.Name));
4242

4343
if (endpointsRemoved == 0)
4444
{
4545
throw new PSArgumentException(string.Format(ProjectResources.Error_EndpointNotFound, this.EndpointName));
4646
}
4747

4848
this.WriteVerbose(ProjectResources.Success);
49-
this.WriteObject(this.Profile);
49+
this.WriteObject(this.TrafficManagerProfile);
5050
}
5151
}
5252
}

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/RemoveAzureTrafficManagerProfile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class RemoveAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
3333

3434
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The profile.", ParameterSetName = "Object")]
3535
[ValidateNotNullOrEmpty]
36-
public new TrafficManagerProfile Profile { get; set; }
36+
public TrafficManagerProfile TrafficManagerProfile { get; set; }
3737

3838
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
3939
public SwitchParameter Force { get; set; }
@@ -53,7 +53,7 @@ public override void ExecuteCmdlet()
5353
}
5454
else if (this.ParameterSetName == "Object")
5555
{
56-
profileToDelete = this.Profile;
56+
profileToDelete = this.TrafficManagerProfile;
5757
}
5858

5959
this.ConfirmAction(

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/SetAzureTrafficManagerProfile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public class SetAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
2525
{
2626
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The profile.")]
2727
[ValidateNotNullOrEmpty]
28-
public new TrafficManagerProfile Profile { get; set; }
28+
public TrafficManagerProfile TrafficManagerProfile { get; set; }
2929

3030
public override void ExecuteCmdlet()
3131
{
32-
TrafficManagerProfile profile = this.TrafficManagerClient.SetTrafficManagerProfile(this.Profile);
32+
TrafficManagerProfile profile = this.TrafficManagerClient.SetTrafficManagerProfile(this.TrafficManagerProfile);
3333

3434
this.WriteVerbose(ProjectResources.Success);
3535
this.WriteObject(profile);

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.TrafficManager.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else
3333
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.TrafficManager.Test")]
34+
#endif

0 commit comments

Comments
 (0)