Skip to content

Commit 60f21f3

Browse files
authored
Merge pull request #12751 from Azure/network-june
Network june
2 parents c0535c1 + 297d4f4 commit 60f21f3

File tree

110 files changed

+38187
-45239
lines changed

Some content is hidden

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

110 files changed

+38187
-45239
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# To make sure Network PRs go to the right branch, e.g. network-april
2-
/src/Network/ @number213
3-
2+
/src/Network/ @MikhailTryakhov
43
/src/Compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore

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.0.2-preview" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
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.3.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
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="38.1.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

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.1.1" />
78
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.2.1" />
8-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
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.0.2-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
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.0.2-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
1616
</ItemGroup>
1717

1818
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<PsModuleName>HDInsight</PsModuleName>
@@ -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.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
19-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
2020
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
2121
</ItemGroup>
2222

src/HPCCache/HPCCache.Test/Fixtures/HpcCacheTestContext.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Commands.HPCCache.Test.Fixtures
1717
using System;
1818
using System.Collections.Generic;
1919
using System.Linq;
20+
using Microsoft.Azure.Commands.HPCCache.Test.ScenarioTests;
2021
using Microsoft.Azure.Commands.HPCCache.Test.Utilities;
2122
using Microsoft.Azure.Management.Authorization;
2223
using Microsoft.Azure.Management.Authorization.Models;
@@ -26,6 +27,7 @@ namespace Microsoft.Azure.Commands.HPCCache.Test.Fixtures
2627
using Microsoft.Azure.Management.Network.Models;
2728
using Microsoft.Azure.Management.StorageCache;
2829
using Microsoft.Azure.Management.StorageCache.Models;
30+
using Microsoft.Azure.Test.HttpRecorder;
2931
using Microsoft.Rest.Azure;
3032
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
3133

@@ -59,6 +61,7 @@ public HpcCacheTestContext(
5961
[System.Runtime.CompilerServices.CallerMemberName]
6062
string methodName = ".ctor")
6163
{
64+
HttpMockServer.Matcher = HpcCacheController.GetRecordMatcher();
6265
this.mockContext = MockContext.Start(suiteObject, methodName);
6366
this.RegisterSubscriptionForResource("Microsoft.StorageCache");
6467
}
@@ -73,6 +76,7 @@ public HpcCacheTestContext(
7376
[System.Runtime.CompilerServices.CallerMemberName]
7477
string methodName = ".ctor")
7578
{
79+
HttpMockServer.Matcher = HpcCacheController.GetRecordMatcher();
7680
this.mockContext = MockContext.Start(type.Name, methodName);
7781
this.RegisterSubscriptionForResource("Microsoft.StorageCache");
7882
}

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="19.18.0-preview" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
2121
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
2222
</ItemGroup>
2323

src/HPCCache/HPCCache.Test/ScenarioTests/HPCCacheController.cs

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,26 @@ public void RunPsTest(XunitTracingInterceptor logger, params string[] scripts)
8585
logger.Information(string.Format("Test method finished: {0}.{1}", callingClassType, mockName));
8686
}
8787

88+
/// <summary>
89+
/// Gets storage management client.
90+
/// </summary>
91+
static public IRecordMatcher GetRecordMatcher()
92+
{
93+
var d = new Dictionary<string, string>
94+
{
95+
{ "Microsoft.Resources", null },
96+
{ "Microsoft.Features", null },
97+
{ "Microsoft.Authorization", null },
98+
{ "Microsoft.Network", null },
99+
};
100+
var providersToIgnore = new Dictionary<string, string>
101+
{
102+
{ "Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01" },
103+
{ "Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2017-05-10" },
104+
};
105+
return new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
106+
}
107+
88108
/// <summary>
89109
/// RunPsTestWorkflow.
90110
/// </summary>
@@ -103,18 +123,7 @@ protected void RunPsTestWorkflow(
103123
Action initialize = null)
104124
{
105125
this.helper.TracingInterceptor = logger;
106-
var d = new Dictionary<string, string>
107-
{
108-
{ "Microsoft.Resources", null },
109-
{ "Microsoft.Features", null },
110-
{ "Microsoft.Authorization", null },
111-
};
112-
var providersToIgnore = new Dictionary<string, string>
113-
{
114-
{ "Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01" },
115-
{ "Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2017-05-10" },
116-
};
117-
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
126+
HttpMockServer.Matcher = GetRecordMatcher();
118127
HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
119128
using (var context = new HpcCacheTestContext(callingClassType, mockName))
120129
{

src/KeyVault/KeyVault.Test/KeyVault.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.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.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

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.1-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
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.4.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
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.0.2-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
1818
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1919
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.1" />
2020
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />

src/Network/Network.Test/NrpTeamAlias.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@ class NrpTeamAlias
6464

6565
// Azure Network IPAM dev team
6666
public const string ipam = "ipamdev";
67+
68+
// Azure Network Billing and Telemetry team
69+
public const string billingandtelemetry = "azurenetworkbilling";
6770
}
6871
}

src/Network/Network.Test/ScenarioTests/AzureFirewallTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,13 @@ public void TestAzureFirewallVirtualHubMultiPublicIPCRUD()
104104
{
105105
TestRunner.RunTestScript("Test-AzureFirewallVirtualHubMultiPublicIPCRUD");
106106
}
107+
108+
[Fact]
109+
[Trait(Category.AcceptanceType, Category.CheckIn)]
110+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
111+
public void TestAzureFirewallCRUDWithAllowActiveFTP()
112+
{
113+
TestRunner.RunTestScript("Test-AzureFirewallCRUDAllowActiveFTP");
114+
}
107115
}
108116
}

src/Network/Network.Test/ScenarioTests/AzureFirewallTests.ps1

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,4 +1515,49 @@ function Test-AzureFirewallVirtualHubMultiPublicIPCRUD {
15151515
# Cleanup
15161516
Clean-ResourceGroup $rgname
15171517
}
1518+
}
1519+
1520+
<#
1521+
.SYNOPSIS
1522+
Tests AzureFirewall AllowActiveFTP
1523+
#>
1524+
function Test-AzureFirewallCRUDAllowActiveFTP {
1525+
$rgname = Get-ResourceGroupName
1526+
$azureFirewallName = Get-ResourceName
1527+
$resourceTypeParent = "Microsoft.Network/AzureFirewalls"
1528+
$location = Get-ProviderLocation $resourceTypeParent "eastus"
1529+
1530+
$vnetName = Get-ResourceName
1531+
$subnetName = "AzureFirewallSubnet"
1532+
$publicIpName = Get-ResourceName
1533+
1534+
try {
1535+
# Create the resource group
1536+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location
1537+
1538+
# Create the Virtual Network
1539+
$subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.0.0/24
1540+
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
1541+
1542+
# Create public ip
1543+
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -Sku Standard
1544+
1545+
# Create AzureFirewall
1546+
$azureFirewall = New-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname -Location $location -AllowActiveFTP
1547+
1548+
# Verify
1549+
$azFirewall = Get-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname
1550+
Assert-AreEqual true $azFirewall.AllowActiveFTP
1551+
1552+
# Reset the AllowActiveFTP flag
1553+
$azFirewall.AllowActiveFTP = $false
1554+
Set-AzFirewall -AzureFirewall $azFirewall
1555+
$azfw = Get-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname
1556+
1557+
Assert-AreEqual false $azfw.AllowActiveFTP
1558+
}
1559+
finally {
1560+
# Cleanup
1561+
Clean-ResourceGroup $rgname
1562+
}
15181563
}

src/Network/Network.Test/ScenarioTests/CortexTests.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void TestCortexExpressRouteCRUD()
4444
}
4545

4646
[Fact]
47-
[Trait(Category.RunType, Category.LiveOnly)]
47+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
4848
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
4949
public void TestCortexDownloadConfig()
5050
{
@@ -90,5 +90,21 @@ public void TestVHubRouteTableCRUD()
9090
{
9191
TestRunner.RunTestScript("Test-VHubRouteTableCRUD");
9292
}
93+
94+
[Fact]
95+
[Trait(Category.AcceptanceType, Category.CheckIn)]
96+
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
97+
public void TestVpnGatewayPacketCapture()
98+
{
99+
TestRunner.RunTestScript("Test-VpnGatewayPacketCapture");
100+
}
101+
102+
[Fact]
103+
[Trait(Category.AcceptanceType, Category.CheckIn)]
104+
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
105+
public void TestVpnConnectionPacketCapture()
106+
{
107+
TestRunner.RunTestScript("Test-VpnConnectionPacketCapture");
108+
}
93109
}
94110
}

0 commit comments

Comments
 (0)