Skip to content

Commit de3d4c2

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#8706 from number213/network-merge
Merge Network's release branch into master
2 parents 323a038 + 8842ca0 commit de3d4c2

File tree

261 files changed

+158140
-175067
lines changed

Some content is hidden

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

261 files changed

+158140
-175067
lines changed

‎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="24.1.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.8.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.9.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.8.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.9.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.8.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.9.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

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

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

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

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

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

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

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

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

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

Lines changed: 915 additions & 305 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.8.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.9.0-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,12 +1486,8 @@ function Test-ApplicationGatewayCRUDSubItems2
14861486
# Add to test Remove
14871487
Add-AzApplicationGatewayBackendHttpSettings -ApplicationGateway $appgw -Name $poolSetting02Name -Port 1234 -Protocol Http -CookieBasedAffinity Enabled -RequestTimeout 42 -HostName test -Path /test -AffinityCookieName test
14881488
$fipconfig = Get-AzApplicationGatewayFrontendIPConfig -ApplicationGateway $appgw -Name $fipconfigName
1489-
$fp02 = Get-AzApplicationGatewayFrontendPort -ApplicationGateway $appgw -Name $frontendPort02Name 
1490-
$sslCert = Get-AzApplicationGatewaySslCertificate -ApplicationGateway $appgw -Name $sslCert01Name
14911489
Add-AzApplicationGatewayHttpListener -ApplicationGateway $appgw -Name $listener02Name -Protocol Https -FrontendIPConfiguration $fipconfig -FrontendPort $fp02 -HostName TestHostName -RequireServerNameIndication true -SslCertificate $sslCert
14921490
$listener02 = Get-AzApplicationGatewayHttpListener -ApplicationGateway $appgw -Name $listener02Name
1493-
$fp02 = Get-AzApplicationGatewayFrontendPort -ApplicationGateway $appgw -Name $frontendPort02Name 
1494-
$sslCert = Get-AzApplicationGatewaySslCertificate -ApplicationGateway $appgw -Name $sslCert01Name
14951491
Add-AzApplicationGatewayHttpListener -ApplicationGateway $appgw -Name $listener03Name -Protocol Https -FrontendIPConfiguration $fipconfig -FrontendPort $fp02 -HostName TestName -SslCertificate $sslCert
14961492
$urlPathMap = Get-AzApplicationGatewayUrlPathMapConfig -ApplicationGateway $appgw -Name $urlPathMapName
14971493
Add-AzApplicationGatewayRequestRoutingRule -ApplicationGateway $appgw -Name $rule02Name -RuleType PathBasedRouting -HttpListener $listener02 -UrlPathMap $urlPathMap

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ function Test-ApplicationSecurityGroupCRUDMinimalParameters
7272
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup;
7373
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
7474

75+
# Get all ApplicationSecurityGroups in subscription wildcard for resource group
76+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -ResourceGroupName "*";
77+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
78+
79+
# Get all ApplicationSecurityGroups in subscription wildcard for name
80+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -Name "*";
81+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
82+
83+
# Get all ApplicationSecurityGroups in subscription wildcard for both resource group and name
84+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -ResourceGroupName "*" -Name "*";
85+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
86+
7587
# Remove ApplicationSecurityGroup
7688
$job = Remove-AzApplicationSecurityGroup -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
7789
$job | Wait-Job;
@@ -128,6 +140,18 @@ function Test-ApplicationSecurityGroupCRUDAllParameters
128140
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup;
129141
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
130142

143+
# Get all ApplicationSecurityGroups in subscription wildcard for resource group
144+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -ResourceGroupName "*";
145+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
146+
147+
# Get all ApplicationSecurityGroups in subscription wildcard for name
148+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -Name "*";
149+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
150+
151+
# Get all ApplicationSecurityGroups in subscription wildcard for both resource group and name
152+
$listApplicationSecurityGroup = Get-AzApplicationSecurityGroup -ResourceGroupName "*" -Name "*";
153+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
154+
131155
# Remove ApplicationSecurityGroup
132156
$job = Remove-AzApplicationSecurityGroup -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
133157
$job | Wait-Job;

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,30 +162,30 @@ function Test-CortexCRUD
162162
Assert-AreEqual $hubVnetConnectionName $hubVnetConnection.Name
163163
$hubVnetConnections = Get-AzureRmVirtualHubVnetConnection -ResourceGroupName $rgName -VirtualHubName $virtualHubName
164164
Assert-NotNull $hubVnetConnections
165-
166-
$hubVnetConnections = Get-AzureRmVirtualHubVnetConnection -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name "*"
165+
$hubVnetConnections = Get-AzureRmVirtualHubVnetConnection -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name "*"
167166
Assert-NotNull $hubVnetConnections
168-
}
169-
finally
170-
{
171-
$delete = Remove-AzVirtualHubVnetConnection -ResourceGroupName $rgName -ParentResourceName $virtualHubName -Name $hubVnetConnectionName -Force -PassThru
172-
Assert-AreEqual $True $delete
173167

174-
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnectionName -Force -PassThru
175-
Assert-AreEqual $True $delete
168+
# Clean up
169+
$delete = Remove-AzVirtualHubVnetConnection -ResourceGroupName $rgName -ParentResourceName $virtualHubName -Name $hubVnetConnectionName -Force -PassThru
170+
Assert-AreEqual $True $delete
176171

177-
$delete = Remove-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName -Force -PassThru
178-
Assert-AreEqual $True $delete
172+
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnectionName -Force -PassThru
173+
Assert-AreEqual $True $delete
179174

180-
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSiteName -Force -PassThru
181-
Assert-AreEqual $True $delete
175+
$delete = Remove-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName -Force -PassThru
176+
Assert-AreEqual $True $delete
182177

183-
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
184-
Assert-AreEqual $True $delete
178+
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSiteName -Force -PassThru
179+
Assert-AreEqual $True $delete
185180

186-
$delete = Remove-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Force -PassThru
187-
Assert-AreEqual $True $delete
181+
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
182+
Assert-AreEqual $True $delete
188183

184+
$delete = Remove-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Force -PassThru
185+
Assert-AreEqual $True $delete
186+
}
187+
finally
188+
{
189189
Clean-ResourceGroup $rgname
190190
}
191191
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ function Test-ExpressRouteCircuitStageCRUD
110110
# set
111111
$circuit.AllowClassicOperations = $false
112112
$circuit = Set-AzExpressRouteCircuit -ExpressRouteCircuit $circuit
113-
114-
$actual = Get-AzExpressRouteCircuitStats -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name
115-
Assert-AreEqual $actual.PrimaryBytesIn 0
113+
114+
$actual = Get-AzExpressRouteCircuitStats -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name
115+
Assert-AreEqual $actual.PrimaryBytesIn 0
116116

117117
#move
118118
$job = Move-AzExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname -Location $location -ServiceKey $circuit.ServiceKey -Force -AsJob
@@ -123,19 +123,19 @@ function Test-ExpressRouteCircuitStageCRUD
123123
$job | Wait-Job
124124
$delete = $job | Receive-Job
125125
Assert-AreEqual true $delete
126-
126+
127+
# Check that the circuit was deleted
127128
$list = Get-AzExpressRouteCircuit -ResourceGroupName $rgname
128-
Assert-AreEqual 0 @($list).Count
129+
Assert-Null ($list | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $circuitName });
129130

130131
$list = Get-AzExpressRouteCircuit -ResourceGroupName "*"
131-
Assert-AreEqual 0 @($list).Count
132+
Assert-Null ($list | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $circuitName });
132133

133134
$list = Get-AzExpressRouteCircuit -Name "*"
134-
Assert-AreEqual 0 @($list).Count
135+
Assert-Null ($list | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $circuitName });
135136

136137
$list = Get-AzExpressRouteCircuit -ResourceGroupName "*" -Name "*"
137-
Assert-AreEqual 0 @($list).Count
138-
138+
Assert-Null ($list | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $circuitName });
139139
}
140140
finally
141141
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,39 @@ public ExpressRouteCircuitTestsGenerated(Xunit.Abstractions.ITestOutputHelper ou
4242
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
4343
public void TestExpressRouteCircuitCRUDMinimalParameters()
4444
{
45-
TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDMinimalParameters");
45+
TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDMinimalParameters");
4646
}
4747

4848
[Fact]
4949
[Trait(Category.AcceptanceType, Category.CheckIn)]
5050
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
5151
public void TestExpressRouteCircuitCRUDAllParameters()
5252
{
53-
TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDAllParameters");
53+
TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDAllParameters");
5454
}
5555

5656
[Fact]
5757
[Trait(Category.AcceptanceType, Category.CheckIn)]
5858
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
5959
public void TestExpressRouteCircuitAuthorizationCRUDMinimalParameters()
6060
{
61-
TestRunner.RunTestScript("Test-ExpressRouteCircuitAuthorizationCRUDMinimalParameters");
61+
TestRunner.RunTestScript("Test-ExpressRouteCircuitAuthorizationCRUDMinimalParameters");
6262
}
6363

6464
[Fact]
6565
[Trait(Category.AcceptanceType, Category.CheckIn)]
6666
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
6767
public void TestExpressRouteCircuitPeeringCRUDMinimalParameters()
6868
{
69-
TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDMinimalParameters");
69+
TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDMinimalParameters");
7070
}
7171

7272
[Fact]
7373
[Trait(Category.AcceptanceType, Category.CheckIn)]
7474
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
7575
public void TestExpressRouteCircuitPeeringCRUDAllParameters()
7676
{
77-
TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDAllParameters");
77+
TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDAllParameters");
7878
}
7979
}
8080
}

0 commit comments

Comments
 (0)