Skip to content

Commit 958bc48

Browse files
erich-wangerich-wang
authored
Merge pull request Azure#10202 from number213/merge
Network September release
2 parents 21b6283 + 55e0ebe commit 958bc48

File tree

317 files changed

+299009
-217588
lines changed

Some content is hidden

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

317 files changed

+299009
-217588
lines changed

‎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="6.0.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
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="29.1.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.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.15.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.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.15.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

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

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

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

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

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

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

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

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

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

Lines changed: 258 additions & 543 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.15.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.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="1.1.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function Test-VolumeCrud
113113
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
114114
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
115115
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
116-
Assert-AreEqual $retrievedVolume.ProtocolTypes[1] 'NFSv4'
116+
Assert-AreEqual $retrievedVolume.ProtocolTypes[1] 'NFSv4.1'
117117
Assert-NotNull $retrievedVolume.MountTargets
118118

119119
# create second volume and check using the confirm flag

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotCrud.json

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

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotPipelines.json

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

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumeCrud.json

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

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumePipelines.json

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

‎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.15.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
1818
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

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

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ function Test-ApplicationGatewayCRUDRewriteRuleSet
716716

717717
# remove autoscale config
718718
$getgw = Remove-AzApplicationGatewayAutoscaleConfiguration -ApplicationGateway $getgw -Force
719-
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 3 -ApplicationGateway $getgw
719+
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 2 -ApplicationGateway $getgw
720720

721721
# Set
722722
$getgw01 = Set-AzApplicationGateway -ApplicationGateway $getgw
@@ -750,7 +750,7 @@ function Test-ApplicationGatewayCRUDRewriteRuleSet
750750
# check sku
751751
$sku01 = Get-AzApplicationGatewaySku -ApplicationGateway $getgw01
752752
Assert-NotNull $sku01
753-
Assert-AreEqual $sku01.Capacity 3
753+
Assert-AreEqual $sku01.Capacity 2
754754
Assert-AreEqual $sku01.Name Standard_v2
755755
Assert-AreEqual $sku01.Tier Standard_v2
756756

@@ -919,7 +919,7 @@ function Test-ApplicationGatewayCRUDRewriteRuleSetWithConditions
919919

920920
# remove autoscale config
921921
$getgw = Remove-AzApplicationGatewayAutoscaleConfiguration -ApplicationGateway $getgw -Force
922-
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 3 -ApplicationGateway $getgw
922+
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 2 -ApplicationGateway $getgw
923923

924924
# Set
925925
$getgw01 = Set-AzApplicationGateway -ApplicationGateway $getgw
@@ -954,7 +954,7 @@ function Test-ApplicationGatewayCRUDRewriteRuleSetWithConditions
954954
# check sku
955955
$sku01 = Get-AzApplicationGatewaySku -ApplicationGateway $getgw01
956956
Assert-NotNull $sku01
957-
Assert-AreEqual $sku01.Capacity 3
957+
Assert-AreEqual $sku01.Capacity 2
958958
Assert-AreEqual $sku01.Name Standard_v2
959959
Assert-AreEqual $sku01.Tier Standard_v2
960960

@@ -1088,15 +1088,15 @@ function Test-ApplicationGatewayCRUD3
10881088

10891089
# remove autoscale config
10901090
$getgw = Remove-AzApplicationGatewayAutoscaleConfiguration -ApplicationGateway $getgw -Force
1091-
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 3 -ApplicationGateway $getgw
1091+
$getgw = Set-AzApplicationGatewaySku -Name Standard_v2 -Tier Standard_v2 -Capacity 2 -ApplicationGateway $getgw
10921092

10931093
# Set
10941094
$getgw01 = Set-AzApplicationGateway -ApplicationGateway $getgw
10951095

10961096
# check sku
10971097
$sku01 = Get-AzApplicationGatewaySku -ApplicationGateway $getgw01
10981098
Assert-NotNull $sku01
1099-
Assert-AreEqual $sku01.Capacity 3
1099+
Assert-AreEqual $sku01.Capacity 2
11001100
Assert-AreEqual $sku01.Name Standard_v2
11011101
Assert-AreEqual $sku01.Tier Standard_v2
11021102

@@ -1739,20 +1739,24 @@ function Test-ApplicationGatewayCRUDSubItems2
17391739
$appgw = Set-AzApplicationGateway -ApplicationGateway $appgw
17401740

17411741
# WAF Policy and Custom Rule
1742-
$variable = New-AzApplicationGatewayFirewallMatchVariable -VariableName RequestHeaders -Selector Content-Length
1742+
# Disabled until Firewall Policy cmdlets are updated
1743+
<#$variable = New-AzApplicationGatewayFirewallMatchVariable -VariableName RequestHeaders -Selector Content-Length
17431744
$condition = New-AzApplicationGatewayFirewallCondition -MatchVariable $variable -Operator GreaterThan -MatchValue 1000 -Transform Lowercase -NegationCondition $False
17441745
$rule = New-AzApplicationGatewayFirewallCustomRule -Name example -Priority 2 -RuleType MatchRule -MatchCondition $condition -Action Block
17451746
New-AzApplicationGatewayFirewallPolicy -Name $wafPolicy -ResourceGroupName $rgname -Location $location
17461747
$policy = Get-AzApplicationGatewayFirewallPolicy -Name $wafPolicy -ResourceGroupName $rgname
17471748
$policy.CustomRules = $rule
1748-
Set-AzApplicationGatewayFirewallPolicy -InputObject $policy
1749-
# Get Application Gateway
1749+
Set-AzApplicationGatewayFirewallPolicy -InputObject $policy#>
1750+
1751+
# Get Application Gateway
17501752
$appgw = Get-AzApplicationGateway -Name $appgwName -ResourceGroupName $rgname
1751-
$appgw.FirewallPolicy = $policy
1752-
$appgw = Set-AzApplicationGateway -ApplicationGateway $appgw
1753+
1754+
# Disabled until Firewall Policy cmdlets are updated
1755+
#$appgw.FirewallPolicy = $policy
1756+
#$appgw = Set-AzApplicationGateway -ApplicationGateway $appgw
17531757

17541758
$appgw = Get-AzApplicationGateway -Name $appgwName -ResourceGroupName $rgname
1755-
$policy = Get-AzApplicationGatewayFirewallPolicy -Name $wafPolicy -ResourceGroupName $rgname
1759+
#$policy = Get-AzApplicationGatewayFirewallPolicy -Name $wafPolicy -ResourceGroupName $rgname
17561760

17571761
# First Check firewall configuraiton
17581762
Assert-AreEqual $appgw.WebApplicationFirewallConfiguration.Enabled $true
@@ -1764,9 +1768,10 @@ function Test-ApplicationGatewayCRUDSubItems2
17641768
Assert-AreEqual $appgw.WebApplicationFirewallConfiguration.MaxRequestBodySizeInKb 80
17651769
Assert-AreEqual $appgw.WebApplicationFirewallConfiguration.FileUploadLimitInMb 70
17661770
Assert-AreEqual $appgw.WebApplicationFirewallConfiguration.Exclusions.Count 2
1767-
1771+
1772+
# Disabled until Firewall Policy cmdlets are updated
17681773
# Second check firewll policy
1769-
Assert-AreEqual $policy.Id $appgw.FirewallPolicy.Id
1774+
<#Assert-AreEqual $policy.Id $appgw.FirewallPolicy.Id
17701775
Assert-AreEqual $policy.CustomRules[0].Name $rule.Name
17711776
Assert-AreEqual $policy.CustomRules[0].RuleType $rule.RuleType
17721777
Assert-AreEqual $policy.CustomRules[0].Action $rule.Action
@@ -1776,7 +1781,7 @@ function Test-ApplicationGatewayCRUDSubItems2
17761781
Assert-AreEqual $policy.CustomRules[0].MatchConditions[0].NegationConditon $rule.MatchConditions[0].NegationConditon
17771782
Assert-AreEqual $policy.CustomRules[0].MatchConditions[0].MatchValues[0] $rule.MatchConditions[0].MatchValues[0]
17781783
Assert-AreEqual $policy.CustomRules[0].MatchConditions[0].MatchVariables[0].VariableName $rule.MatchConditions[0].MatchVariables[0].VariableName
1779-
Assert-AreEqual $policy.CustomRules[0].MatchConditions[0].MatchVariables[0].Selector $rule.MatchConditions[0].MatchVariables[0].Selector
1784+
Assert-AreEqual $policy.CustomRules[0].MatchConditions[0].MatchVariables[0].Selector $rule.MatchConditions[0].MatchVariables[0].Selector#>
17801785

17811786
# Set non-exiting
17821787
Assert-ThrowsLike { Set-AzApplicationGatewayHttpListenerCustomError -HttpListener $listener01 -StatusCode HttpStatus408 -CustomErrorPageUrl $customError403Url02 } "*does not exist*"

‎src/Network/Network.Test/ScenarioTests/AvailableAliasTests.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 AvailableAliasTests :NetworkTestRunner
22+
{
23+
public AvailableAliasTests(Xunit.Abstractions.ITestOutputHelper output)
24+
: base(output)
25+
{
26+
}
27+
28+
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
30+
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
31+
public void TestAvailableAliasList()
32+
{
33+
TestRunner.RunTestScript( "Test-GetAvailableAliasList");
34+
}
35+
}
36+
}

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
<#
16+
.SYNOPSIS
17+
Tests checking API to list available Alias.
18+
#>
19+
function Test-GetAvailableAliasList
20+
{
21+
$location = Get-ProviderLocation ResourceManagement
22+
23+
try
24+
{
25+
$results = Get-AzAvailableServiceAlias -Location $location;
26+
Assert-NotNull $results;
27+
}
28+
finally
29+
{
30+
# Cleanup
31+
Clean-ResourceGroup $rgname
32+
}
33+
}

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
namespace Commands.Network.Test.ScenarioTests
16+
{
17+
using Microsoft.Azure.Commands.Network.Test.ScenarioTests;
18+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
19+
using Xunit;
20+
using Xunit.Abstractions;
21+
22+
public class BastionTests : NetworkTestRunner
23+
{
24+
public BastionTests(ITestOutputHelper output)
25+
: base(output)
26+
{
27+
}
28+
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
[Trait(Category.Owner, Category.bastion)]
32+
public void TestBastionCRUD()
33+
{
34+
TestRunner.RunTestScript("Test-BastionCRUD");
35+
}
36+
37+
[Fact]
38+
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
[Trait(Category.Owner, Category.bastion)]
40+
public void TestBastionVnetsIpObjectsParams()
41+
{
42+
TestRunner.RunTestScript("Test-BastionVnetsIpObjectsParams");
43+
}
44+
45+
[Fact]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
47+
[Trait(Category.Owner, Category.bastion)]
48+
public void TestBastionVnetObjectParam()
49+
{
50+
TestRunner.RunTestScript("Test-BastionVnetObjectParam");
51+
}
52+
53+
[Fact]
54+
[Trait(Category.AcceptanceType, Category.CheckIn)]
55+
[Trait(Category.Owner, Category.bastion)]
56+
public void TestBastionIpObjectParam()
57+
{
58+
TestRunner.RunTestScript("Test-BastionIpObjectParam");
59+
}
60+
}
61+
}

0 commit comments

Comments
 (0)