Skip to content

Commit 68e3984

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#10043 from number213/merge-network
Merge Network release branch into master
2 parents dd246c8 + 2f99fc1 commit 68e3984

File tree

306 files changed

+300140
-272428
lines changed

Some content is hidden

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

306 files changed

+300140
-272428
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.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.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.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.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.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.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.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

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

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

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

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

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

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

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

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

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

Lines changed: 340 additions & 328 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.14.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.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.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

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

Lines changed: 1034 additions & 621 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: 761 additions & 752 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: 1153 additions & 2032 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: 654 additions & 888 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.14.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1818
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.0.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

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

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ function Test-AzureFirewallCRUD
5858
$appRule2Port1 = 8080
5959
$appRule2ProtocolType1 = "http"
6060

61+
# AzureFirewallApplicationRule 3
62+
$appRule3Name = "appRule3"
63+
$appRule3Fqdn1 = "sql1.database.windows.net"
64+
$appRule3Protocol1 = "mssql:1433"
65+
$appRule3Port1 = 1433
66+
$appRule3ProtocolType1 = "mssql"
67+
6168
# AzureFirewallNetworkRuleCollection
6269
$networkRcName = "networkRc"
6370
$networkRcPriority = 200
@@ -160,11 +167,14 @@ function Test-AzureFirewallCRUD
160167

161168
$appRule2 = New-AzFirewallApplicationRule -Name $appRule2Name -Protocol $appRule2Protocol1 -TargetFqdn $appRule2Fqdn1
162169

170+
$appRule3 = New-AzFirewallApplicationRule -Name $appRule3Name -Protocol $appRule3Protocol1 -TargetFqdn $appRule3Fqdn1
171+
163172
# Create Application Rule Collection with 1 rule
164173
$appRc = New-AzFirewallApplicationRuleCollection -Name $appRcName -Priority $appRcPriority -Rule $appRule -ActionType $appRcActionType
165174

166175
# Add a rule to the rule collection using AddRule method
167176
$appRc.AddRule($appRule2)
177+
$appRc.AddRule($appRule3)
168178

169179
# Create a second Application Rule Collection with 1 rule
170180
$appRc2 = New-AzFirewallApplicationRuleCollection -Name $appRc2Name -Priority $appRc2Priority -Rule $appRule -ActionType $appRc2ActionType
@@ -233,7 +243,7 @@ function Test-AzureFirewallCRUD
233243

234244
# Check rule collections
235245
Assert-AreEqual 2 @($getAzureFirewall.ApplicationRuleCollections).Count
236-
Assert-AreEqual 2 @($getAzureFirewall.ApplicationRuleCollections[0].Rules).Count
246+
Assert-AreEqual 3 @($getAzureFirewall.ApplicationRuleCollections[0].Rules).Count
237247
Assert-AreEqual 1 @($getAzureFirewall.ApplicationRuleCollections[1].Rules).Count
238248

239249
Assert-AreEqual 1 @($getAzureFirewall.NatRuleCollections).Count
@@ -245,6 +255,7 @@ function Test-AzureFirewallCRUD
245255
$appRc = $getAzureFirewall.GetApplicationRuleCollectionByName($appRcName)
246256
$appRule = $appRc.GetRuleByName($appRule1Name)
247257
$appRule2 = $appRc.GetRuleByName($appRule2Name)
258+
$appRule3 = $appRc.GetRuleByName($appRule3Name)
248259

249260
# Verify application rule collection 1
250261
Assert-AreEqual $appRcName $appRc.Name
@@ -281,6 +292,19 @@ function Test-AzureFirewallCRUD
281292
Assert-AreEqual 1 $appRule2.TargetFqdns.Count
282293
Assert-AreEqual $appRule2Fqdn1 $appRule2.TargetFqdns[0]
283294

295+
# Verify application rule 3
296+
Assert-AreEqual $appRule3Name $appRule3.Name
297+
Assert-Null $appRule3.Description
298+
299+
Assert-AreEqual 0 $appRule3.SourceAddresses.Count
300+
301+
Assert-AreEqual 1 $appRule3.Protocols.Count
302+
Assert-AreEqual $appRule3ProtocolType1 $appRule3.Protocols[0].ProtocolType
303+
Assert-AreEqual $appRule3Port1 $appRule3.Protocols[0].Port
304+
305+
Assert-AreEqual 1 $appRule3.TargetFqdns.Count
306+
Assert-AreEqual $appRule3Fqdn1 $appRule3.TargetFqdns[0]
307+
284308
# Verify application rule collection 2
285309
$appRc2 = $getAzureFirewall.GetApplicationRuleCollectionByName($appRc2Name)
286310

@@ -505,16 +529,16 @@ function Test-AzureFirewallCRUDWithZones
505529
Assert-AreEqual @($list[0].NetworkRuleCollections).Count @($getAzureFirewall.NetworkRuleCollections).Count
506530

507531
# list all Azure Firewalls under subscription
508-
$listAll = Get-AzureRmFirewall
532+
$listAll = Get-AzFirewall
509533
Assert-NotNull $listAll
510534

511-
$listAll = Get-AzureRmFirewall -Name "*"
535+
$listAll = Get-AzFirewall -Name "*"
512536
Assert-NotNull $listAll
513537

514-
$listAll = Get-AzureRmFirewall -ResourceGroupName "*"
538+
$listAll = Get-AzFirewall -ResourceGroupName "*"
515539
Assert-NotNull $listAll
516540

517-
$listAll = Get-AzureRmFirewall -ResourceGroupName "*" -Name "*"
541+
$listAll = Get-AzFirewall -ResourceGroupName "*" -Name "*"
518542
Assert-NotNull $listAll
519543

520544
# Create Application Rules

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ Gets the default location for a provider
5959
#>
6060
function Get-ProviderLocation($provider, $preferredLocation = "West Central US", $useCanonical = $null)
6161
{
62+
# This env variable should be used only for live testing
63+
if($env:AZURE_NRP_TEST_LOCATION -and $env:AZURE_NRP_TEST_LOCATION -match "^[a-z0-9\s]+$")
64+
{
65+
return $env:AZURE_NRP_TEST_LOCATION;
66+
}
6267
if($null -eq $useCanonical)
6368
{
6469
$useCanonical = -not $preferredLocation.Contains(" ");
@@ -67,17 +72,10 @@ function Get-ProviderLocation($provider, $preferredLocation = "West Central US",
6772
{
6873
$preferredLocation = Normalize-Location $preferredLocation;
6974
}
70-
if((Get-NetworkTestMode) -ne 'Playback')
75+
if($provider.Contains("/"))
7176
{
72-
if($env:AZURE_NRP_TEST_LOCATION -and $env:AZURE_NRP_TEST_LOCATION -match "^[a-z0-9\s]+$")
73-
{
74-
return $env:AZURE_NRP_TEST_LOCATION;
75-
}
76-
if($provider.Contains("/"))
77-
{
78-
$providerNamespace, $resourceType = $provider.Split("/");
79-
return Get-Location $providerNamespace $resourceType $preferredLocation -UseCanonical:$($useCanonical);
80-
}
77+
$providerNamespace, $resourceType = $provider.Split("/");
78+
return Get-Location $providerNamespace $resourceType $preferredLocation -UseCanonical:$($useCanonical);
8179
}
8280
return $preferredLocation;
8381
}

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

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ function Test-CortexCRUD
2929
$remoteVirtualNetworkName = Get-ResourceName
3030
$vpnConnectionName = Get-ResourceName
3131
$hubVnetConnectionName = Get-ResourceName
32+
$vpnSite2Name = Get-ResourceName
33+
$vpnSiteLink1Name = Get-ResourceName
34+
$vpnSiteLink2Name = Get-ResourceName
35+
$vpnConnection2Name = Get-ResourceName
36+
$vpnLink1ConnectionName = Get-ResourceName
37+
$vpnLink2ConnectionName = Get-ResourceName
3238

3339
$storeName = 'blob' + $rgName
3440

@@ -106,6 +112,27 @@ function Test-CortexCRUD
106112
Assert-AreEqual $vpnSiteName $vpnSite.Name
107113
Assert-AreEqual "2.3.4.5" $vpnSite.IpAddress
108114

115+
# Create the VpnSite with Links
116+
$vpnSite2AddressSpaces = New-Object string[] 2
117+
$vpnSite2AddressSpaces[0] = "192.169.2.0/24"
118+
$vpnSite2AddressSpaces[1] = "192.169.3.0/24"
119+
$vpnSiteLink1 = New-AzVpnSiteLink -Name $vpnSiteLink1Name -IpAddress "5.5.5.5" -LinkProviderName "SomeTelecomProvider1" -LinkSpeedInMbps "10"
120+
$vpnSiteLink2 = New-AzVpnSiteLink -Name $vpnSiteLink2Name -IpAddress "5.5.5.6" -LinkProviderName "SomeTelecomProvider2" -LinkSpeedInMbps "10"
121+
$createdVpnSite2 = New-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -Location $rglocation -VirtualWan $virtualWan -AddressSpace $vpnSite2AddressSpaces -DeviceModel "SomeDevice" -DeviceVendor "SomeDeviceVendor" -VpnSiteLink @($vpnSiteLink1, $vpnSiteLink2)
122+
$vpnSite2 = Get-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name
123+
Assert-AreEqual $rgName $vpnSite2.ResourceGroupName
124+
Assert-AreEqual $vpnSite2Name $vpnSite2.Name
125+
Assert-AreEqual 2 $vpnSite2.VpnSiteLinks.Count
126+
$vpnSiteLink1.IpAddress = "7.3.4.5"
127+
$vpnSite2AddressSpaces = New-Object string[] 2
128+
$vpnSite2AddressSpaces[0] = "192.170.2.0/24"
129+
$vpnSite2AddressSpaces[1] = "192.170.3.0/24"
130+
Update-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -VpnSiteLink @($vpnSiteLink1) -AddressSpace $vpnSite2AddressSpaces
131+
$updatedVpnSite2 = Get-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name
132+
Assert-AreEqual 1 $updatedVpnSite2.VpnSiteLinks.Count
133+
Assert-AreEqual "7.3.4.5" $updatedVpnSite2.VpnSiteLinks[0].IpAddress
134+
Update-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -VpnSiteLink @($vpnSiteLink1, $vpnSiteLink2)
135+
109136
$vpnSites = Get-AzureRmVpnSite -ResourceGroupName $rgName
110137
Assert-NotNull $vpnSites
111138

@@ -159,6 +186,23 @@ function Test-CortexCRUD
159186
Assert-AreEqual 30 $vpnConnection.ConnectionBandwidth
160187
Assert-AreEqual $false $vpnConnection.UseLocalAzureIpAddress
161188

189+
# Create the VpnConnection with site with links
190+
$vpnSiteLinkConnection1 = New-AzVpnSiteLinkConnection -Name $vpnLink1ConnectionName -VpnSiteLink $vpnSite2.VpnSiteLinks[0] -ConnectionBandwidth 100
191+
$vpnSiteLinkConnection2 = New-AzVpnSiteLinkConnection -Name $vpnLink2ConnectionName -VpnSiteLink $vpnSite2.VpnSiteLinks[1] -ConnectionBandwidth 10
192+
193+
$createdVpnConnection2 = New-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name -VpnSite $vpnSite2 -VpnSiteLinkConnection @($vpnSiteLinkConnection1, $vpnSiteLinkConnection2)
194+
$vpnConnection2 = Get-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name
195+
Assert-AreEqual $vpnConnection2Name $vpnConnection2.Name
196+
Assert-AreEqual 2 $vpnConnection2.VpnLinkConnections.Count
197+
198+
$vpnSiteLinkConnection1.RoutingWeight = 10
199+
Update-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name -VpnSiteLinkConnection @($vpnSiteLinkConnection1)
200+
$vpnConnection2 = Get-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name
201+
202+
Assert-AreEqual $vpnConnection2Name $vpnConnection2.Name
203+
Assert-AreEqual 1 $vpnConnection2.VpnLinkConnections.Count
204+
Assert-AreEqual 10 $vpnConnection2.VpnLinkConnections[0].RoutingWeight
205+
162206
$vpnConnections = Get-AzureRmVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName
163207
Assert-NotNull $vpnConnections
164208

@@ -182,12 +226,18 @@ function Test-CortexCRUD
182226
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnectionName -Force -PassThru
183227
Assert-AreEqual $True $delete
184228

229+
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name -Force -PassThru
230+
Assert-AreEqual $True $delete
231+
185232
$delete = Remove-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName -Force -PassThru
186233
Assert-AreEqual $True $delete
187234

188235
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSiteName -Force -PassThru
189236
Assert-AreEqual $True $delete
190237

238+
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -Force -PassThru
239+
Assert-AreEqual $True $delete
240+
191241
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
192242
Assert-AreEqual $True $delete
193243

@@ -213,9 +263,15 @@ function Test-CortexDownloadConfig
213263
$virtualWanName = Get-ResourceName
214264
$virtualHubName = Get-ResourceName
215265
$vpnSiteName = Get-ResourceName
266+
$vpnSite2Name = Get-ResourceName
267+
$vpnSiteLink1Name = Get-ResourceName
268+
$vpnSiteLink2Name = Get-ResourceName
216269
$vpnGatewayName = Get-ResourceName
217270
$remoteVirtualNetworkName = Get-ResourceName
218271
$vpnConnectionName = Get-ResourceName
272+
$vpnConnection2Name = Get-ResourceName
273+
$vpnLink1ConnectionName = Get-ResourceName
274+
$vpnLink2ConnectionName = Get-ResourceName
219275
$hubVnetConnectionName = Get-ResourceName
220276

221277
$storeName = 'blob' + $rgName
@@ -246,6 +302,18 @@ function Test-CortexDownloadConfig
246302
Assert-AreEqual $rgName $vpnSite.ResourceGroupName
247303
Assert-AreEqual $vpnSiteName $vpnSite.Name
248304

305+
# Create the VpnSite with Links
306+
$vpnSite2AddressSpaces = New-Object string[] 2
307+
$vpnSite2AddressSpaces[0] = "192.169.2.0/24"
308+
$vpnSite2AddressSpaces[1] = "192.169.3.0/24"
309+
$vpnSiteLink1 = New-AzVpnSiteLink -Name $vpnSiteLink1Name -IpAddress "5.5.5.5" -LinkProviderName "SomeTelecomProvider1" -LinkSpeedInMbps "10"
310+
$vpnSiteLink2 = New-AzVpnSiteLink -Name $vpnSiteLink2Name -IpAddress "5.5.5.6" -LinkProviderName "SomeTelecomProvider2" -LinkSpeedInMbps "100"
311+
$createdVpnSite2 = New-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -Location $rglocation -VirtualWan $virtualWan -AddressSpace $vpnSite2AddressSpaces -DeviceModel "SomeDevice" -DeviceVendor "SomeDeviceVendor" -VpnSiteLink @($vpnSiteLink1, $vpnSiteLink2)
312+
$vpnSite2 = Get-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name
313+
Assert-AreEqual $rgName $vpnSite2.ResourceGroupName
314+
Assert-AreEqual $vpnSite2Name $vpnSite2.Name
315+
Assert-AreEqual 2 $vpnSite2.VpnSiteLinks.Count
316+
249317
# Create the VpnGateway
250318
$createdVpnGateway = New-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName -VirtualHub $virtualHub -VpnGatewayScaleUnit 3
251319
$vpnGateway = Get-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName
@@ -257,9 +325,18 @@ function Test-CortexDownloadConfig
257325
$vpnConnection = Get-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnectionName
258326
Assert-AreEqual $vpnConnectionName $vpnConnection.Name
259327

328+
# Create the VpnConnection with site with links
329+
$vpnSiteLinkConnection1 = New-AzVpnSiteLinkConnection -Name $vpnLink1ConnectionName -VpnSiteLink $vpnSite2.VpnSiteLinks[0] -ConnectionBandwidth 100
330+
$vpnSiteLinkConnection2 = New-AzVpnSiteLinkConnection -Name $vpnLink2ConnectionName -VpnSiteLink $vpnSite2.VpnSiteLinks[1] -ConnectionBandwidth 10
331+
332+
$createdVpnConnection2 = New-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name -VpnSite $vpnSite2 -VpnSiteLinkConnection @($vpnSiteLinkConnection1, $vpnSiteLinkConnection2)
333+
$vpnConnection2 = Get-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name
334+
Assert-AreEqual $vpnConnection2Name $vpnConnection2.Name
335+
Assert-AreEqual 2 $vpnConnection2.VpnLinkConnections.Count
336+
260337
# Download config
261338
$storetype = 'Standard_GRS'
262-
$containerName = 'cont' + $rgName
339+
$containerName = "cont$($rgName)"
263340
New-AzStorageAccount -ResourceGroupName $rgName -Name $storeName -Location $rglocation -Type $storetype
264341
$key = Get-AzStorageAccountKey -ResourceGroupName $rgName -Name $storeName
265342
$context = New-AzStorageContext -StorageAccountName $storeName -StorageAccountKey $key[0].Value
@@ -270,19 +347,26 @@ function Test-CortexDownloadConfig
270347
$now=get-date
271348
$blobSasUrl = New-AzStorageBlobSASToken -Container $containerName -Blob emptyfile.txt -Context $context -Permission "rwd" -StartTime $now.AddHours(-1) -ExpiryTime $now.AddDays(1) -FullUri
272349

273-
$vpnSitesForConfig = New-Object Microsoft.Azure.Commands.Network.Models.PSVpnSite[] 1
350+
$vpnSitesForConfig = New-Object Microsoft.Azure.Commands.Network.Models.PSVpnSite[] 2
274351
$vpnSitesForConfig[0] = $vpnSite
352+
$vpnSitesForConfig[1] = $vpnSite2
275353
Get-AzVirtualWanVpnConfiguration -VirtualWan $virtualWan -StorageSasUrl $blobSasUrl -VpnSite $vpnSitesForConfig
276354

277355
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnectionName -Force -PassThru
278356
Assert-AreEqual $True $delete
357+
358+
$delete = Remove-AzVpnConnection -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name $vpnConnection2Name -Force -PassThru
359+
Assert-AreEqual $True $delete
279360

280361
$delete = Remove-AzVpnGateway -ResourceGroupName $rgName -Name $vpnGatewayName -Force -PassThru
281362
Assert-AreEqual $True $delete
282363

283364
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSiteName -Force -PassThru
284365
Assert-AreEqual $True $delete
285366

367+
$delete = Remove-AzVpnSite -ResourceGroupName $rgName -Name $vpnSite2Name -Force -PassThru
368+
Assert-AreEqual $True $delete
369+
286370
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
287371
Assert-AreEqual $True $delete
288372

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,13 @@ public void TestExpressRoutePortCRUDMinimalParameters()
3232
{
3333
TestRunner.RunTestScript(string.Format("Test-ExpressRoutePortCRUD"));
3434
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
39+
public void TestExpressRoutePortIdentityCRUD()
40+
{
41+
TestRunner.RunTestScript("Test-ExpressRoutePortIdentityCRUD");
42+
}
3543
}
3644
}

0 commit comments

Comments
 (0)