Skip to content

Commit 4d61b78

Browse files
markcowlmarkcowl
authored
Merge pull request #4074 from markcowl/vladca410
Traffic Manager Cmdlet changes
2 parents b934e28 + 3111d0b commit 4d61b78

File tree

67 files changed

+25413
-2483
lines changed

Some content is hidden

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

67 files changed

+25413
-2483
lines changed

‎src/ResourceManager/TrafficManager/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
-->
2020
## Current Release
2121

22+
* New Monitor settings 'MonitorIntervalInSeconds', 'MonitorTimeoutInSeconds', 'MonitorToleratedNumberOfFailures'
23+
* New Monitor protocol 'TCP'
24+
2225
## Version 3.0.1
2326

2427
## Version 3.0.0

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -68,9 +68,10 @@
6868
<SpecificVersion>False</SpecificVersion>
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
71+
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
73+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.7.0\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
74+
<Private>True</Private>
7475
</Reference>
7576
<Reference Include="Microsoft.CSharp" />
7677
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -80,17 +81,26 @@
8081
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8182
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
8283
</Reference>
83-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
84+
<Reference Include="Microsoft.Rest.ClientRuntime">
85+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
89+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
8590
<Private>True</Private>
8691
</Reference>
8792
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
93+
<SpecificVersion>False</SpecificVersion>
94+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
95+
<Private>True</Private>
96+
</Reference>
97+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
98+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.6.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
8999
<Private>True</Private>
90100
</Reference>
91101
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
92-
<SpecificVersion>False</SpecificVersion>
93102
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
103+
<Private>True</Private>
94104
</Reference>
95105
<Reference Include="System" />
96106
<Reference Include="System.Core" />
@@ -151,7 +161,7 @@
151161
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
152162
</None>
153163
<None Include="SessionRecords\**\*.json">
154-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
164+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
155165
</None>
156166
</ItemGroup>
157167
<ItemGroup>

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/Common.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,13 @@ function TestSetup-AddEndpoint($endpointName, $profile)
9393
$profile = Add-AzureRmTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile -Type "ExternalEndpoints" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"
9494

9595
return $profile
96-
}
96+
}
97+
98+
<#
99+
.SYNOPSIS
100+
Cleans the created resource groups
101+
#>
102+
function TestCleanup-RemoveResourceGroup($rgname)
103+
{
104+
Remove-AzureRmResourceGroup -Name $rgname -Force
105+
}

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,35 @@ public void TestRemoveNonExistingEndpointFromProfile()
9595
TestController.NewInstance.RunPowerShellTest("Test-RemoveNonExistingEndpointFromProfile");
9696
}
9797

98-
[Fact(Skip = "TFS#5185296")]
98+
[Fact]
9999
[Trait(Category.AcceptanceType, Category.CheckIn)]
100100
public void TestEnableEndpoint()
101101
{
102102
TestController.NewInstance.RunPowerShellTest("Test-EnableEndpoint");
103103
}
104104

105-
[Fact(Skip = "TFS#5185296")]
105+
[Fact]
106106
[Trait(Category.AcceptanceType, Category.CheckIn)]
107107
public void TestDisableEndpoint()
108108
{
109109
TestController.NewInstance.RunPowerShellTest("Test-DisableEndpoint");
110110
}
111111

112-
[Fact(Skip = "TFS#5185296")]
112+
[Fact]
113113
[Trait(Category.AcceptanceType, Category.CheckIn)]
114114
public void TestEnableEndpointUsingPiping()
115115
{
116116
TestController.NewInstance.RunPowerShellTest("Test-EnableEndpointUsingPiping");
117117
}
118118

119-
[Fact(Skip = "TFS#5185296")]
119+
[Fact]
120+
[Trait(Category.AcceptanceType, Category.CheckIn)]
121+
public void TestEnableEndpointUsingPipingFromGetProfile()
122+
{
123+
TestController.NewInstance.RunPowerShellTest("Test-EnableEndpointUsingPipingFromGetProfile");
124+
}
125+
126+
[Fact]
120127
[Trait(Category.AcceptanceType, Category.CheckIn)]
121128
public void TestDisableEndpointUsingPiping()
122129
{
@@ -136,5 +143,26 @@ public void TestDisableNonExistingEndpoint()
136143
{
137144
TestController.NewInstance.RunPowerShellTest("Test-DisableNonExistingEndpoint");
138145
}
146+
147+
[Fact]
148+
[Trait(Category.AcceptanceType, Category.CheckIn)]
149+
public void TestEndpointTypeCaseInsensitive()
150+
{
151+
TestController.NewInstance.RunPowerShellTest("Test-EndpointTypeCaseInsensitive");
152+
}
153+
154+
[Fact]
155+
[Trait(Category.AcceptanceType, Category.CheckIn)]
156+
public void TestPipeEndpointFromGetEndpoint()
157+
{
158+
TestController.NewInstance.RunPowerShellTest("Test-PipeEndpointFromGetEndpoint");
159+
}
160+
161+
[Fact]
162+
[Trait(Category.AcceptanceType, Category.CheckIn)]
163+
public void TestPipeEndpointFromGetProfile()
164+
{
165+
TestController.NewInstance.RunPowerShellTest("Test-PipeEndpointFromGetProfile");
166+
}
139167
}
140168
}

0 commit comments

Comments
 (0)