Skip to content

Commit 2eb2d61

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#9381 from number213/network-april
Merge Network's release branch into master
2 parents 176f4c8 + eff5b6c commit 2eb2d61

File tree

394 files changed

+315876
-261675
lines changed

Some content is hidden

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

394 files changed

+315876
-261675
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,6 @@
16331633
"New-AzFirewallNetworkRuleCollection": "New-AzureRmFirewallNetworkRuleCollection",
16341634
"New-AzFirewallNetworkRule": "New-AzureRmFirewallNetworkRule",
16351635
"Get-AzFirewallFqdnTag": "Get-AzureRmFirewallFqdnTag",
1636-
"Get-AzInterfaceEndpoint": "Get-AzureRmInterfaceEndpoint",
16371636
"Add-AzNetworkInterfaceTapConfig": "Add-AzureRmNetworkInterfaceTapConfig",
16381637
"Get-AzNetworkInterfaceTapConfig": "Get-AzureRmNetworkInterfaceTapConfig",
16391638
"Set-AzNetworkInterfaceTapConfig": "Set-AzureRmNetworkInterfaceTapConfig",

‎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="27.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎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="19.11.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
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="19.11.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrud.json

Lines changed: 379 additions & 322 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkIds.json

Lines changed: 379 additions & 322 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkObjects.json

Lines changed: 317 additions & 431 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudRegistrationVirtualNetwork.json

Lines changed: 308 additions & 251 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudResolutionVirtualNetwork.json

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

‎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="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎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="0.9.1-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
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="19.11.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
1818
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.0.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,9 @@ function Test-ApplicationGatewayCRUDSubItems2
16551655
$rewriteRuleSet = New-AzApplicationGatewayRewriteRuleSet -Name $rewriteRuleSetName -RewriteRule $rewriteRule
16561656

16571657
$videoPathRule = New-AzApplicationGatewayPathRuleConfig -Name $PathRuleName -Paths "/video" -RedirectConfiguration $redirectConfig -RewriteRuleSet $rewriteRuleSet
1658+
Assert-AreEqual $videoPathRule.RewriteRuleSet.Id $rewriteRuleSet.Id
16581659
$imagePathRule = New-AzApplicationGatewayPathRuleConfig -Name $PathRule01Name -Paths "/image" -RedirectConfigurationId $redirectConfig.Id -RewriteRuleSetId $rewriteRuleSet.Id
1660+
Assert-AreEqual $imagePathRule.RewriteRuleSet.Id $rewriteRuleSet.Id
16591661
$urlPathMap = New-AzApplicationGatewayUrlPathMapConfig -Name $urlPathMapName -PathRules $videoPathRule -DefaultBackendAddressPool $pool -DefaultBackendHttpSettings $poolSetting01
16601662
$urlPathMap2 = New-AzApplicationGatewayUrlPathMapConfig -Name $urlPathMapName2 -PathRules $videoPathRule,$imagePathRule -DefaultRedirectConfiguration $redirectConfig -DefaultRewriteRuleSet $rewriteRuleSet
16611663
$probe = New-AzApplicationGatewayProbeConfig -Name $probeName -Protocol Http -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8 -MinServers 1 -PickHostNameFromBackendHttpSettings

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.Azure.Commands.Network.Test.ScenarioTests;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
17+
using Xunit;
18+
19+
namespace Commands.Network.Test.ScenarioTests
20+
{
21+
public class AvailablePrivateEndpointTypeTests : NetworkTestRunner
22+
{
23+
public AvailablePrivateEndpointTypeTests(Xunit.Abstractions.ITestOutputHelper output)
24+
: base(output)
25+
{
26+
}
27+
28+
[Fact(Skip = "TODO: record")]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
30+
[Trait(Category.Owner, NrpTeamAlias.wanrpdev)]
31+
public void TestAvailablePrivateEndpointTypeCRUD()
32+
{
33+
TestRunner.RunTestScript("Test-AvailablePrivateEndpointTypeCRUD");
34+
}
35+
}
36+
}

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
function Check-CmdletReturnType
16+
{
17+
param($cmdletName, $cmdletReturn)
18+
19+
$cmdletData = Get-Command $cmdletName;
20+
Assert-NotNull $cmdletData;
21+
[array]$cmdletReturnTypes = $cmdletData.OutputType.Name | Foreach-Object { return ($_ -replace "Microsoft.Azure.Commands.Network.Models.","") };
22+
[array]$cmdletReturnTypes = $cmdletReturnTypes | Foreach-Object { return ($_ -replace "System.","") };
23+
$realReturnType = $cmdletReturn.GetType().Name -replace "Microsoft.Azure.Commands.Network.Models.","";
24+
return $cmdletReturnTypes -contains $realReturnType;
25+
}
26+
27+
<#
28+
.SYNOPSIS
29+
Test creating new AvailablePrivateEndpointType
30+
#>
31+
function Test-AvailablePrivateEndpointTypeCRUD
32+
{
33+
# Setup
34+
$rgname = Get-ResourceGroupName;
35+
$rglocation = Get-ProviderLocation ResourceManagement;
36+
$location = Get-ProviderLocation "Microsoft.Network/availablePrivateEndpointTypes" "eastus2euap";
37+
38+
try
39+
{
40+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation;
41+
42+
$vAvailablePrivateEndpointType = Get-AzAvailablePrivateEndpointType -Location eastus2euap;
43+
Assert-True { Check-CmdletReturnType "Get-AzAvailablePrivateEndpointType" $vAvailablePrivateEndpointType };
44+
Assert-NotNull $vAvailablePrivateEndpointType;
45+
}
46+
finally
47+
{
48+
# Cleanup
49+
Clean-ResourceGroup $rgname;
50+
}
51+
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,22 @@ public void TestAzureFirewallCRUD()
3434
TestRunner.RunTestScript("Test-AzureFirewallCRUD");
3535
}
3636

37+
[Fact]
38+
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
40+
public void TestAzureFirewallCRUDWithZones()
41+
{
42+
TestRunner.RunTestScript("Test-AzureFirewallCRUDWithZones");
43+
}
44+
45+
[Fact]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
47+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
48+
public void TestAzureFirewallPIPAndVNETObjectTypeParams()
49+
{
50+
TestRunner.RunTestScript("Test-AzureFirewallPIPAndVNETObjectTypeParams");
51+
}
52+
3753
[Fact]
3854
[Trait(Category.AcceptanceType, Category.CheckIn)]
3955
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]

0 commit comments

Comments
 (0)