Skip to content

Commit b1ffc97

Browse files
wyunchi-mswyunchi-ms
authored
Merge pull request Azure#14539 from Azure/network-november
[Network] Sync from Network november to master
2 parents e9d57b6 + 98bec11 commit b1ffc97

File tree

75 files changed

+43458
-192985
lines changed

Some content is hidden

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

75 files changed

+43458
-192985
lines changed

‎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.3.0" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.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>Compute</PsModuleName>
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="44.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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: 2 additions & 2 deletions
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.3.0" />
7+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
88
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="2.0.0" />
99
</ItemGroup>
10-
</Project>
10+
</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.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
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.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
1616
</ItemGroup>
1717

18-
</Project>
18+
</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.3.0" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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.3.0" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
2121
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
2222
</ItemGroup>
2323

‎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.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
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.3-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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.8.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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.3.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.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/AzureFirewallTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,13 @@ public void TestAzureFirewallCRUDWithAllowActiveFTP()
112112
{
113113
TestRunner.RunTestScript("Test-AzureFirewallCRUDAllowActiveFTP");
114114
}
115+
116+
[Fact]
117+
[Trait(Category.AcceptanceType, Category.CheckIn)]
118+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
119+
public void TestAzureFirewallNoDataPip()
120+
{
121+
TestRunner.RunTestScript("Test-AzureFirewallNoDataPip");
122+
}
115123
}
116124
}

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

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,4 +1527,90 @@ function Test-AzureFirewallCRUDAllowActiveFTP {
15271527
# Cleanup
15281528
Clean-ResourceGroup $rgname
15291529
}
1530+
}
1531+
1532+
<#
1533+
.SYNOPSIS
1534+
Tests AzureFirewall NoDataPip
1535+
#>
1536+
function Test-AzureFirewallNoDataPip {
1537+
# Setup
1538+
$rgname = Get-ResourceGroupName
1539+
$azureFirewallName = Get-ResourceName
1540+
$resourceTypeParent = "Microsoft.Network/AzureFirewalls"
1541+
$location = Get-ProviderLocation $resourceTypeParent "centraluseuap"
1542+
1543+
$vnetName = Get-ResourceName
1544+
$subnetName = "AzureFirewallSubnet"
1545+
$mgmtSubnetName = "AzureFirewallManagementSubnet"
1546+
$mgmtPublicIpName = Get-ResourceName
1547+
$publicIp1Name = Get-ResourceName
1548+
1549+
try {
1550+
# Create the resource group
1551+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location -Tags @{ testtag = "testval" }
1552+
1553+
# Create the Virtual Network
1554+
$subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.0.0/24
1555+
$mgmtSubnet = New-AzVirtualNetworkSubnetConfig -Name $mgmtSubnetName -AddressPrefix 10.0.100.0/24
1556+
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet,$mgmtSubnet
1557+
1558+
# Get full subnet details
1559+
$subnet = Get-AzVirtualNetworkSubnetConfig -VirtualNetwork $vnet -Name $subnetName
1560+
$mgmtSubnet = Get-AzVirtualNetworkSubnetConfig -VirtualNetwork $vnet -Name $mgmtSubnetName
1561+
1562+
# Create mgmt public ip
1563+
$mgmtPublicIp = New-AzPublicIpAddress -ResourceGroupName $rgname -name $mgmtPublicIpName -location $location -AllocationMethod Static -Sku Standard
1564+
1565+
# Create AzureFirewall with a management IP, without data PIP
1566+
$azureFirewall = New-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname -Location $location -VirtualNetwork $vnet -ManagementPublicIpAddress $mgmtPublicIp
1567+
1568+
# Get AzureFirewall
1569+
$getAzureFirewall = Get-AzFirewall -name $azureFirewallName -ResourceGroupName $rgname
1570+
1571+
# Verify creating firewall without data PIP
1572+
Assert-AreEqual $rgName $getAzureFirewall.ResourceGroupName
1573+
Assert-AreEqual $azureFirewallName $getAzureFirewall.Name
1574+
Assert-NotNull $getAzureFirewall.Location
1575+
Assert-AreEqual (Normalize-Location $location) $getAzureFirewall.Location
1576+
Assert-NotNull $getAzureFirewall.Etag
1577+
Assert-AreEqual 1 @($getAzureFirewall.IpConfigurations).Count
1578+
Assert-Null $getAzureFirewall.IpConfigurations[0].PublicIpAddress.Id
1579+
Assert-NotNull $getAzureFirewall.IpConfigurations[0].Subnet.Id
1580+
Assert-NotNull $getAzureFirewall.IpConfigurations[0].PrivateIpAddress
1581+
Assert-AreEqual $subnet.Id $getAzureFirewall.IpConfigurations[0].Subnet.Id
1582+
Assert-NotNull $getAzureFirewall.ManagementIpConfiguration
1583+
Assert-NotNull $getAzureFirewall.ManagementIpConfiguration.Subnet.Id
1584+
Assert-NotNull $getAzureFirewall.ManagementIpConfiguration.PublicIpAddress.Id
1585+
Assert-AreEqual $mgmtSubnet.Id $getAzureFirewall.ManagementIpConfiguration.Subnet.Id
1586+
Assert-AreEqual $mgmtPublicIp.Id $getAzureFirewall.ManagementIpConfiguration.PublicIpAddress.Id
1587+
1588+
# Verify adding a data PIP to firewall
1589+
$publicip1 = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIp1Name -location $location -AllocationMethod Static -Sku Standard
1590+
$getAzureFirewall.AddPublicIpAddress($publicip1)
1591+
Set-AzFirewall -AzureFirewall $getAzureFirewall
1592+
Assert-NotNull $getAzureFirewall.IpConfigurations[0].PublicIpAddress.Id
1593+
Assert-AreEqual $publicip1.Id $getAzureFirewall.IpConfigurations.PublicIpAddress.Id
1594+
1595+
# Verify removing data PIP from exisiting FT firewall
1596+
$getAzureFirewall.RemovePublicIpAddress($publicip1)
1597+
Set-AzFirewall -AzureFirewall $getAzureFirewall
1598+
Assert-AreEqual 1 @($getAzureFirewall.IpConfigurations).Count
1599+
Assert-Null $getAzureFirewall.IpConfigurations[0].PublicIpAddress.Id
1600+
1601+
# Delete AzureFirewall
1602+
$delete = Remove-AzFirewall -ResourceGroupName $rgname -name $azureFirewallName -PassThru -Force
1603+
Assert-AreEqual true $delete
1604+
1605+
# Delete VirtualNetwork
1606+
$delete = Remove-AzVirtualNetwork -ResourceGroupName $rgname -name $vnetName -PassThru -Force
1607+
Assert-AreEqual true $delete
1608+
1609+
$list = Get-AzFirewall -ResourceGroupName $rgname
1610+
Assert-AreEqual 0 @($list).Count
1611+
}
1612+
finally {
1613+
# Cleanup
1614+
Clean-ResourceGroup $rgname
1615+
}
15301616
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,13 @@ public void TestVpnConnectionPacketCapture()
106106
{
107107
TestRunner.RunTestScript("Test-VpnConnectionPacketCapture");
108108
}
109+
110+
[Fact]
111+
[Trait(Category.AcceptanceType, Category.CheckIn)]
112+
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
113+
public void TestVpnSiteLinkConnectionGetIkeSa()
114+
{
115+
TestRunner.RunTestScript("Test-VpnSiteLinkConnectionGetIkeSa");
116+
}
109117
}
110118
}

0 commit comments

Comments
 (0)