Skip to content

Commit f1f2eff

Browse files
dingmeng-xuedingmeng-xue
authored
Merge pull request #15207 from network-february
[Do not squash] merge network features to master
2 parents 6353626 + 57c6fc1 commit f1f2eff

File tree

140 files changed

+26769
-9151
lines changed

Some content is hidden

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

140 files changed

+26769
-9151
lines changed

‎src/Accounts/Accounts/AzureRmAlias/Mappings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,7 @@
14941494
"Set-AzLoadBalancerBackendAddressPool": "Set-AzureRmLoadBalancerBackendAddressPool",
14951495
"New-AzLoadBalancerBackendAddressPool": "New-AzureRmLoadBalancerBackendAddressPool",
14961496
"Remove-AzLoadBalancerBackendAddressPool": "Remove-AzureRmLoadBalancerBackendAddressPool",
1497+
"New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig": "New-AzureRmLoadBalancerBackendAddressPoolTunnelInterfaceConfig",
14971498
"New-AzLoadBalancerBackendAddressConfig": "New-AzureRmLoadBalancerBackendAddressConfig",
14981499
"Get-AzLoadBalancerBackendAddressPoolConfig": "Get-AzureRmLoadBalancerBackendAddressPoolConfig",
14991500
"Add-AzLoadBalancerBackendAddressPoolConfig": "Add-AzureRmLoadBalancerBackendAddressPoolConfig",

‎src/Batch/Batch.Test/Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
1919
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="47.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/ContainerRegistry/ContainerRegistry.Test/ContainerRegistry.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="4.0.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
1717
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0">
1818
<NoWarn>NU1608</NoWarn>

‎src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
7+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
88
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="3.0.0" />
99
</ItemGroup>
1010
</Project>

‎src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Dns/Dns.Test/Dns.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/HDInsight/HDInsight.Test/HDInsight.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
1717
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
1818
<PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
19-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
2121
</ItemGroup>
2222

‎src/HPCCache/HPCCache.Test/HPCCache.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
2121
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
2222
</ItemGroup>
2323

‎src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>
@@ -26,4 +26,3 @@
2626
</ItemGroup>
2727

2828
</Project>
29-

‎src/Monitor/Monitor.Test/Monitor.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.3-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1717
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
1818
</ItemGroup>
1919

‎src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.12.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Network/Network.Test/Network.Test.csproj

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

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1818
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1919
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
2020
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,7 +3297,7 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
32973297
$gwSubnet = Get-AzVirtualNetworkSubnetConfig -Name $gwSubnetName -VirtualNetwork $vnet
32983298

32993299
# Create public ip
3300-
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -sku Standard
3300+
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -Zone 1,2 -AllocationMethod Static -sku Standard
33013301

33023302
# Create ip configuration
33033303
$gipconfig = New-AzApplicationGatewayIPConfiguration -Name $gipconfigname -Subnet $gwSubnet
@@ -3343,10 +3343,9 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
33433343
$sslProfiles = Get-AzApplicationGatewaySslProfile -ApplicationGateway $getgw
33443344
Assert-AreEqual $sslProfiles.Count 1
33453345
Assert-AreEqual $sslProfiles[0].Id $sslProfile01.Id
3346-
Assert-AreEqual $sslProfile01.TrustedClientCertificates.Count 1
3347-
Assert-AreEqual $sslProfiles.TrustedClientCertificates[0].Id $trustedClient01.Id
3346+
Assert-AreEqual $sslProfile01.TrustedClientCertificates.Count 1
3347+
Assert-AreEqual $sslProfiles.TrustedClientCertificates[0].Id $trustedClient01.Id
33483348

3349-
$trustedClient01 = Get-AzApplicationGatewayTrustedClientCertificate -Name $trustedClientCert01Name -ApplicationGateway $getgw
33503349
$trustedClients = Get-AzApplicationGatewayTrustedClientCertificate -ApplicationGateway $getgw
33513350
Assert-AreEqual $trustedClients.Count 1
33523351
Assert-AreEqual $trustedClients[0].Id $trustedClient01.Id
@@ -3424,4 +3423,4 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
34243423
# Cleanup
34253424
Clean-ResourceGroup $rgname
34263425
}
3427-
}
3426+
}

‎src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,13 @@ public void TestAzureFirewallPolicyPremiumWithTerminateTLSEnabledAndTargetUrls()
132132
{
133133
TestRunner.RunTestScript("Test-AzureFirewallPolicyPremiumWithTerminateTLSEnabledAndTargetUrls");
134134
}
135+
136+
[Fact]
137+
[Trait(Category.AcceptanceType, Category.CheckIn)]
138+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
139+
public void TestAzureFirewallPolicyPrivateRangeCRUD()
140+
{
141+
TestRunner.RunTestScript("Test-AzureFirewallPolicyPrivateRangeCRUD");
142+
}
135143
}
136144
}

‎src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,4 +1417,48 @@ function Test-AzureFirewallPolicyPremiumFeatures {
14171417
# Cleanup
14181418
Clean-ResourceGroup $rgname
14191419
}
1420+
}
1421+
1422+
<#
1423+
.SYNOPSIS
1424+
Tests AzureFirewall Policy PrivateRange
1425+
#>
1426+
function Test-AzureFirewallPolicyPrivateRangeCRUD {
1427+
$rgname = Get-ResourceGroupName
1428+
$azureFirewallPolicyName = Get-ResourceName
1429+
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
1430+
$location = "westus2"
1431+
$vnetName = Get-ResourceName
1432+
$privateRange2 = @("IANAPrivateRanges", "0.0.0.0/0", "66.92.0.0/16")
1433+
$privateRange1 = @("3.3.0.0/24", "98.0.0.0/8")
1434+
$privateRange2Translated = @("0.0.0.0/0", "66.92.0.0/16", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10")
1435+
1436+
try {
1437+
1438+
# Create the resource group
1439+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location -Tags @{ testtag = "testval" }
1440+
1441+
# Create AzureFirewallPolicy (with no rules, ThreatIntel is in Alert mode by default)
1442+
$azureFirewallPolicy = New-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname -Location $location -PrivateRange $privateRange1
1443+
1444+
# Get AzureFirewallPolicy
1445+
$getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
1446+
1447+
#verification
1448+
Assert-AreEqual $rgName $getAzureFirewallPolicy.ResourceGroupName
1449+
Assert-AreEqual $azureFirewallPolicyName $getAzureFirewallPolicy.Name
1450+
Assert-NotNull $getAzureFirewallPolicy.Location
1451+
Assert-AreEqual (Normalize-Location $location) $getAzureFirewallPolicy.Location
1452+
Assert-AreEqualArray $privateRange1 $getAzureFirewallPolicy.PrivateRange
1453+
1454+
# Modify
1455+
$azureFirewallPolicy.PrivateRange = $privateRange2
1456+
Set-AzFirewallPolicy -InputObject $azureFirewallPolicy
1457+
$getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
1458+
Assert-AreEqualArray $privateRange2Translated $getAzureFirewallPolicy.PrivateRange
1459+
}
1460+
finally {
1461+
# Cleanup
1462+
Clean-ResourceGroup $rgname
1463+
}
14201464
}

‎src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,5 +248,29 @@ public void TestCreateSubresourcesOnEmptyLoadBalancer()
248248
{
249249
TestRunner.RunTestScript("Test-CreateSubresourcesOnEmptyLoadBalancer");
250250
}
251+
252+
[Fact]
253+
[Trait(Category.AcceptanceType, Category.CheckIn)]
254+
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
255+
public void TestGatewayLoadBalancerProviderOnePool()
256+
{
257+
TestRunner.RunTestScript("Test-GatewayLoadBalancer-ProviderOnePool");
258+
}
259+
260+
[Fact]
261+
[Trait(Category.AcceptanceType, Category.CheckIn)]
262+
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
263+
public void TestGatewayLoadBalancerProviderTwoPool()
264+
{
265+
TestRunner.RunTestScript("Test-GatewayLoadBalancer-ProviderTwoPool");
266+
}
267+
268+
[Fact]
269+
[Trait(Category.AcceptanceType, Category.CheckIn)]
270+
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
271+
public void TestGatewayLoadBalancerConsumerLb()
272+
{
273+
TestRunner.RunTestScript("Test-GatewayLoadBalancer-ConsumerLb");
274+
}
251275
}
252276
}

0 commit comments

Comments
 (0)