Skip to content

Commit 1d6a5cf

Browse files
ogailogail
ogail
authored and
ogail
committed
Migrate TrafficManager2 project
1 parent 3aeaaea commit 1d6a5cf

21 files changed

+36
-25
lines changed

‎src/ResourceManager.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Sql.Test", "Resour
113113
EndProject
114114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Test", "ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\Commands.StreamAnalytics.Test.csproj", "{7E6683BE-ECFF-4709-89EB-1325E9E70512}"
115115
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
117+
EndProject
116118
Global
117119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
118120
Debug|Any CPU = Debug|Any CPU
@@ -323,6 +325,10 @@ Global
323325
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.Build.0 = Debug|Any CPU
324326
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.ActiveCfg = Release|Any CPU
325327
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.Build.0 = Release|Any CPU
328+
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
329+
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU
330+
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU
331+
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU
326332
EndGlobalSection
327333
GlobalSection(SolutionProperties) = preSolution
328334
HideSolutionNode = FALSE
@@ -348,5 +354,6 @@ Global
348354
{6C7D3D81-37AB-445E-8081-78A1FEC0A773} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
349355
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
350356
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
357+
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
351358
EndGlobalSection
352359
EndGlobal

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@
136136
</None>
137137
</ItemGroup>
138138
<ItemGroup>
139-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
140-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
141-
<Name>Commands.Common</Name>
139+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
140+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
141+
<Name>Commands.ResourceManager.Common</Name>
142142
</ProjectReference>
143143
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
144144
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/TestController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ namespace Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests
2121
using Microsoft.Azure.Management.Authorization;
2222
using Microsoft.Azure.Management.Resources;
2323
using Microsoft.Azure.Management.TrafficManager;
24-
24+
2525
using Microsoft.Azure.Test;
2626
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2727
using Microsoft.Azure.Subscriptions;
28+
using WindowsAzure.Commands.Test.Utilities.Common;
2829

29-
public class TestController
30+
public class TestController : RMTestBase
3031
{
3132
private CSMTestEnvironmentFactory csmTestFactory;
3233

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ namespace Microsoft.Azure.Commands.TrafficManager.Test.UnitTests
1818
using System.Management.Automation;
1919
using Microsoft.Azure.Commands.TrafficManager.Models;
2020
using Microsoft.WindowsAzure.Commands.ScenarioTest;
21+
using WindowsAzure.Commands.Test.Utilities.Common;
2122
using Xunit;
2223

23-
public class AddAzureTrafficManagerEndpointConfigTests
24+
public class AddAzureTrafficManagerEndpointConfigTests : RMTestBase
2425
{
2526
[Fact]
2627
[Trait(Category.AcceptanceType, Category.CheckIn)]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ namespace Microsoft.Azure.Commands.TrafficManager.Test.UnitTests
1919
using Microsoft.Azure.Commands.TrafficManager;
2020
using Microsoft.Azure.Commands.TrafficManager.Models;
2121
using Microsoft.WindowsAzure.Commands.ScenarioTest;
22+
using WindowsAzure.Commands.Test.Utilities.Common;
2223
using Xunit;
2324

24-
public class RemoveAzureTrafficManagerEndpointConfigTests
25+
public class RemoveAzureTrafficManagerEndpointConfigTests : RMTestBase
2526
{
2627
[Fact]
2728
[Trait(Category.AcceptanceType, Category.CheckIn)]

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@
121121
</Content>
122122
</ItemGroup>
123123
<ItemGroup>
124-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
125-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
126-
<Name>Commands.Common</Name>
124+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
125+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
126+
<Name>Commands.ResourceManager.Common</Name>
127127
</ProjectReference>
128128
<ProjectReference Include="..\..\Tags\Commands.Tags\Commands.Tags.csproj">
129129
<Project>{2493A8F7-1949-4F29-8D53-9D459046C3B8}</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class AddAzureTrafficManagerEndpointConfig : TrafficManagerBaseCmdlet
6464
[ValidateNotNullOrEmpty]
6565
public string EndpointLocation { get; set; }
6666

67-
public override void ExecuteCmdlet()
67+
protected override void ProcessRecord()
6868
{
6969
if (this.TrafficManagerProfile.Endpoints == null)
7070
{

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/DisableAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class DisableAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
4747
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
4848
public SwitchParameter Force { get; set; }
4949

50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
var disabled = false;
5353
TrafficManagerEndpoint endpointToDisable = null;

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/EnableAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class EnableAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
4444
[ValidateNotNullOrEmpty]
4545
public TrafficManagerEndpoint TrafficManagerEndpoint { get; set; }
4646

47-
public override void ExecuteCmdlet()
47+
protected override void ProcessRecord()
4848
{
4949
TrafficManagerEndpoint endpointToEnable = null;
5050

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/GetAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class GetAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
4444
[ValidateNotNullOrEmpty]
4545
public TrafficManagerEndpoint TrafficManagerEndpoint { get; set; }
4646

47-
public override void ExecuteCmdlet()
47+
protected override void ProcessRecord()
4848
{
4949
TrafficManagerEndpoint trafficManagerEndpoint = null;
5050

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/NewAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class NewAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
6868
[ValidateNotNullOrEmpty]
6969
public string EndpointLocation { get; set; }
7070

71-
public override void ExecuteCmdlet()
71+
protected override void ProcessRecord()
7272
{
7373
// We are not supporting etags yet, NewAzureTrafficManagerEndpoint should not overwrite any existing endpoint.
7474
// Since our create operation is implemented using PUT, it will overwrite by default.

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/RemoveAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class RemoveAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
4747
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
4848
public SwitchParameter Force { get; set; }
4949

50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
var deleted = false;
5353
TrafficManagerEndpoint trafficManagerEndpointToDelete = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class RemoveAzureTrafficManagerEndpointConfig : TrafficManagerBaseCmdlet
3131
[ValidateNotNullOrEmpty]
3232
public TrafficManagerProfile TrafficManagerProfile { get; set; }
3333

34-
public override void ExecuteCmdlet()
34+
protected override void ProcessRecord()
3535
{
3636
if (this.TrafficManagerProfile.Endpoints == null)
3737
{

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Endpoint/SetAzureTrafficManagerEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class SetAzureTrafficManagerEndpoint : TrafficManagerBaseCmdlet
2727
[ValidateNotNullOrEmpty]
2828
public TrafficManagerEndpoint TrafficManagerEndpoint { get; set; }
2929

30-
public override void ExecuteCmdlet()
30+
protected override void ProcessRecord()
3131
{
3232
TrafficManagerEndpoint trafficManagerEndpoint = this.TrafficManagerClient.SetTrafficManagerEndpoint(this.TrafficManagerEndpoint);
3333

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/DisableAzureTrafficManagerProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DisableAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
3838
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
3939
public SwitchParameter Force { get; set; }
4040

41-
public override void ExecuteCmdlet()
41+
protected override void ProcessRecord()
4242
{
4343
var disabled = false;
4444
TrafficManagerProfile profileToDisable = null;

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/EnableAzureTrafficManagerProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class EnableAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
3535
[ValidateNotNullOrEmpty]
3636
public TrafficManagerProfile TrafficManagerProfile { get; set; }
3737

38-
public override void ExecuteCmdlet()
38+
protected override void ProcessRecord()
3939
{
4040
TrafficManagerProfile profileToEnable = null;
4141

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/GetAzureTrafficManagerProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GetAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
3131
[ValidateNotNullOrEmpty]
3232
public string ResourceGroupName { get; set; }
3333

34-
public override void ExecuteCmdlet()
34+
protected override void ProcessRecord()
3535
{
3636
if (this.ResourceGroupName == null && this.Name != null)
3737
{

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Profile/NewAzureTrafficManagerProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class NewAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
7070
[Parameter(Mandatory = false, HelpMessage = "A hash table which represents resource tags.")]
7171
public Hashtable[] Tag { get; set; }
7272

73-
public override void ExecuteCmdlet()
73+
protected override void ProcessRecord()
7474
{
7575
// We are not supporting etags yet, NewAzureTrafficManagerProfile should not overwrite any existing profile.
7676
// Since our create operation is implemented using PUT, it will overwrite by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class RemoveAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
3838
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
3939
public SwitchParameter Force { get; set; }
4040

41-
public override void ExecuteCmdlet()
41+
protected override void ProcessRecord()
4242
{
4343
var deleted = false;
4444
TrafficManagerProfile profileToDelete = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class SetAzureTrafficManagerProfile : TrafficManagerBaseCmdlet
2727
[ValidateNotNullOrEmpty]
2828
public TrafficManagerProfile TrafficManagerProfile { get; set; }
2929

30-
public override void ExecuteCmdlet()
30+
protected override void ProcessRecord()
3131
{
3232
TrafficManagerProfile profile = this.TrafficManagerClient.SetTrafficManagerProfile(this.TrafficManagerProfile);
3333

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerBaseCmdlet.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
namespace Microsoft.Azure.Commands.TrafficManager.Utilities
1616
{
17+
using ResourceManager.Common;
1718
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1819

19-
public abstract class TrafficManagerBaseCmdlet : AzureSMCmdlet
20+
public abstract class TrafficManagerBaseCmdlet : AzureRMCmdlet
2021
{
2122
private TrafficManagerClient trafficManagerClient;
2223

0 commit comments

Comments
 (0)