Skip to content

Commit dd7014c

Browse files
MikhailTryakhovMikhailTryakhov
committed
Merge remote-tracking branch 'Anton-ps/test-api-2018-08-01' into sept-record
# Conflicts: # src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1 # src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/VirtualNetworkGatewayOpenVPNTest.json # src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/VirtualNetworkGatewayRouteApiTest.json
2 parents 5e72b06 + a369e10 commit dd7014c

File tree

147 files changed

+82156
-104778
lines changed

Some content is hidden

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

147 files changed

+82156
-104778
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
3131
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
3232
<PackageReference Include="Moq" Version="4.7.145" />
3333
</ItemGroup>

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<Reference Include="Microsoft.Azure.Management.Compute">
4747
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.21.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
49+
<Reference Include="Microsoft.Azure.Management.Network, Version=20.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.20.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="21.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="20.0.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="7.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
28+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
2929
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3030
</ItemGroup>
3131

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
52+
<Reference Include="Microsoft.Azure.Management.Network, Version=20.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.20.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5454
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>

‎src/ResourceManager/Dns/Commands.Dns.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="20.0.0-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
28+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
2929
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<RunCodeAnalysis>false</RunCodeAnalysis>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
46+
<Reference Include="Microsoft.Azure.Management.Network, Version=20.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.20.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5050
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ApplicationGatewayTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ function Test-ApplicationGatewayCRUD
203203
Assert-AreEqual 1 $getgw.Probes[1].Match.StatusCodes.Count
204204

205205
# Get Application Gateway backend health with expanded resource
206-
$job = Get-AzureRmApplicationGatewayBackendHealth -Name $appgwName -ResourceGroupName $rgname -ExpandResource "backendhealth/applicationgatewayresource" -AsJob
207-
$job | Wait-Job
208-
$backendHealth = $job | Receive-Job
209-
Assert-NotNull $backendHealth.BackendAddressPools[0].BackendAddressPool.Name
206+
# $job = Get-AzureRmApplicationGatewayBackendHealth -Name $appgwName -ResourceGroupName $rgname -ExpandResource "backendhealth/applicationgatewayresource" -AsJob
207+
# $job | Wait-Job
208+
# $backendHealth = $job | Receive-Job
209+
# Assert-NotNull $backendHealth.BackendAddressPools[0].BackendAddressPool.Name
210210

211211
# Get Application Gateway backend health without expanded resource
212212
$backendHealth = Get-AzureRmApplicationGatewayBackendHealth -Name $appgwName -ResourceGroupName $rgname

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/Common.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Gets the default location for a provider
5555
#>
5656
function Get-ProviderLocation($provider)
5757
{
58+
return "westcentralus";
5859
if ((Get-NetworkTestMode) -ne 'Playback')
5960
{
6061
$namespace = $provider.Split("/")[0]
@@ -65,7 +66,7 @@ function Get-ProviderLocation($provider)
6566

6667
if ($location -eq $null)
6768
{
68-
return "West US"
69+
return "WestUS2"
6970
}
7071
else
7172
{

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LoadBalancerTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,8 +2252,8 @@ function Test-LoadBalancerZones
22522252
$zones = "1";
22532253
$rglocation = Get-ProviderLocation ResourceManagement
22542254
# TODO: replace hardcoded location
2255-
# $resourceTypeParent = "Microsoft.Network/loadBalancers"
2256-
$location = "eastus2"; # = Get-ProviderLocation $resourceTypeParent
2255+
$resourceTypeParent = "Microsoft.Network/loadBalancers"
2256+
$location = "centralus";
22572257

22582258
try
22592259
{

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD.json

Lines changed: 3551 additions & 10041 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD2.json

Lines changed: 2065 additions & 4490 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)