Skip to content

Commit 5f81ef0

Browse files
harics24Hari Prasad PerabattulaSatya-anshu
authored
Add new properties a new commandlet to support the address space update in peered vNets (#14730)
* Changes for adding new commandlet for sync operation * Reverting the unintended change related to flow timeout * Updating with the SDK that has the newer fields Updating with the SDK that has the newer fields * Updating the networking SDK for all references Updating the networking SDK for all references * Added Parameter Set & Updated Changelog.md & Recorded PS Test * Minor update to changelog.md file and removed comment from VirtualNetworkTests.cs * Added default parameter set and ShouldSupportProcess=false * Added default parameter set and ShouldSupportProcess=false * Sync-AzVirtualNetworkPeering.md Help file * Updated links in help files * Minor spacing issue in help files hyperlink * Changed synopsis and description from comment to actual string * Added Sync-AzVirtualNetworkPeering to StaticAnalysis exception to ignore the shouldProcess error * Updating build steps * Setting supportsshouldprocess = true in sync-azvnetpeering * Reverting the Signature Issues Co-authored-by: Hari Prasad Perabattula <[email protected]> Co-authored-by: Satya-anshu <[email protected]>
1 parent b996748 commit 5f81ef0

File tree

38 files changed

+4241
-23
lines changed

38 files changed

+4241
-23
lines changed

‎.azure-pipelines/util/analyze-steps.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ steps:
77
parameters:
88
osName: ${{ parameters.osName }}
99

10+
- task: UseDotNet@2
11+
displayName: 'Use .NET Core sdk'
12+
inputs:
13+
packageType: sdk
14+
version: 2.1.x
15+
1016
- pwsh: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
1117
displayName: 'Install platyPS'
1218

‎.azure-pipelines/util/build-steps.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ steps:
99
inputs:
1010
filePath: tools/CheckIgnoredFile.ps1
1111

12+
- task: UseDotNet@2
13+
displayName: 'Use .NET Core sdk'
14+
inputs:
15+
packageType: sdk
16+
version: 2.1.x
17+
1218
- task: DotNetCoreCLI@2
1319
displayName: Build
1420
inputs:

‎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="330.2247.36274" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="44.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="330.2247.36274" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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: 1 addition & 1 deletion
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="330.2247.36274" />
7+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
88
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="2.0.0" />
99
</ItemGroup>
1010
</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="330.2247.36274" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
1616
</ItemGroup>
1717

1818
</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="330.2247.36274" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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.10.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="330.2247.36274" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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="330.2247.36274" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="413.1856.57282" />
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/VirtualNetworkTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,13 @@ public void TestVirtualNetworkCRUDFlowTimeout()
153153
{
154154
TestRunner.RunTestScript("Test-VirtualNetworkCRUD-FlowTimeout");
155155
}
156+
157+
[Fact]
158+
[Trait(Category.AcceptanceType, Category.CheckIn)]
159+
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
160+
public void TestVirtualNetworkPeeringSyncCRUD()
161+
{
162+
TestRunner.RunTestScript("Test-SyncVirtualNetworkPeeringCRUD");
163+
}
156164
}
157165
}

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

Lines changed: 123 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,4 +1342,126 @@ function Test-VirtualNetworkCRUD-FlowTimeout
13421342
# Cleanup
13431343
Clean-ResourceGroup $rgname
13441344
}
1345-
}
1345+
}
1346+
1347+
<#
1348+
.SYNOPSIS
1349+
Tests on CRUD for Sync on VirtualNetworkpeering.
1350+
#>
1351+
function Test-SyncVirtualNetworkPeeringCRUD
1352+
{
1353+
# Setup
1354+
$rgname = Get-ResourceGroupName
1355+
$peerName = Get-ResourceName
1356+
$peerName2 = Get-ResourceName
1357+
$vnet1Name = Get-ResourceName
1358+
$vnet2Name = Get-ResourceName
1359+
$subnet1Name = Get-ResourceName
1360+
$subnet2Name = Get-ResourceName
1361+
$rglocation = "eastus2euap"
1362+
$resourceTypeParent = "Microsoft.Network/virtualNetworks"
1363+
$location = "eastus2euap"
1364+
1365+
try
1366+
{
1367+
# Create the resource group
1368+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
1369+
1370+
# Create the Virtual Network1
1371+
$subnet1 = New-AzVirtualNetworkSubnetConfig -Name $subnet1Name -AddressPrefix 10.1.1.0/24
1372+
$vnet1 = New-AzVirtualNetwork -Name $vnet1Name -ResourceGroupName $rgname -Location $location -AddressPrefix 10.1.0.0/16 -Subnet $subnet1
1373+
1374+
1375+
Assert-AreEqual $vnet1.ResourceGroupName $rgname
1376+
Assert-AreEqual $vnet1.Name $vnet1Name
1377+
Assert-AreEqual $vnet1.Location $rglocation
1378+
Assert-AreEqual "Succeeded" $vnet1.ProvisioningState
1379+
Assert-AreEqual $vnet1.Subnets[0].Name $subnet1.Name
1380+
1381+
# Create the Virtual Network2
1382+
$subnet2 = New-AzVirtualNetworkSubnetConfig -Name $subnet2Name -AddressPrefix 10.2.1.0/24
1383+
$vnet2 = New-AzVirtualNetwork -Name $vnet2Name -ResourceGroupName $rgname -Location $location -AddressPrefix 10.2.0.0/16 -Subnet $subnet2
1384+
1385+
Assert-AreEqual $vnet2.ResourceGroupName $rgname
1386+
Assert-AreEqual $vnet2.Name $vnet2Name
1387+
Assert-AreEqual $vnet2.Location $rglocation
1388+
Assert-AreEqual "Succeeded" $vnet2.ProvisioningState
1389+
1390+
# Add Peering to vnet1
1391+
$job = $vnet1 | Add-AzVirtualNetworkPeering -name $peerName -RemoteVirtualNetworkId $vnet2.Id -AllowForwardedTraffic -AsJob
1392+
$job | Wait-Job
1393+
$peer1 = $job | Receive-Job
1394+
1395+
# Add Peering to VNet2
1396+
$job = $vnet2 | Add-AzVirtualNetworkPeering -name $peerName2 -RemoteVirtualNetworkId $vnet1.Id -AllowForwardedTraffic -AsJob
1397+
$job | Wait-Job
1398+
$peer2 = $job | Receive-Job
1399+
1400+
Assert-AreEqual $peer1.ResourceGroupName $rgname
1401+
Assert-AreEqual $peer1.Name $peerName
1402+
Assert-AreEqual $peer1.VirtualNetworkName $vnet1Name
1403+
Assert-AreEqual "Succeeded" $peer1.ProvisioningState
1404+
Assert-AreEqual $peer1.RemoteVirtualNetwork.Id $vnet2.Id
1405+
Assert-AreEqual $peer1.AllowVirtualNetworkAccess True
1406+
Assert-AreEqual $peer1.AllowForwardedTraffic True
1407+
1408+
Assert-AreEqual $peer2.ResourceGroupName $rgname
1409+
Assert-AreEqual $peer2.Name $peerName2
1410+
Assert-AreEqual $peer2.VirtualNetworkName $vnet2Name
1411+
Assert-AreEqual "Succeeded" $peer2.ProvisioningState
1412+
Assert-AreEqual $peer2.RemoteVirtualNetwork.Id $vnet1.Id
1413+
Assert-AreEqual $peer2.AllowVirtualNetworkAccess True
1414+
Assert-AreEqual $peer2.AllowForwardedTraffic True
1415+
1416+
# Check if Address Spaces are same
1417+
Assert-AreEqual $peer1.RemoteVirtualNetworkAddressSpace.AddressPrefixesText $vnet2.AddressSpace.AddressPrefixesText
1418+
1419+
# Update Address Space of vnet1
1420+
$vnet1.AddressSpace.AddressPrefixes.Add("10.99.0.0/16")
1421+
$vnet1 | Set-AzVirtualNetwork
1422+
1423+
# Get and Check Peering Sync Levels of Vnet1 and Vnet2
1424+
$peer1 = Get-AzVirtualNetworkPeering -VirtualNetworkName $vnet1Name -Name $peerName -ResourceGroupName $rgname
1425+
$peer2 = Get-AzVirtualNetworkPeering -VirtualNetworkName $vnet2Name -Name $peerName2 -ResourceGroupName $rgname
1426+
1427+
Assert-AreEqual $peer1.PeeringSyncLevel "RemoteNotInSync"
1428+
Assert-AreEqual $peer2.PeeringSyncLevel "LocalNotInSync"
1429+
1430+
# Call Sync on VNet2
1431+
$syncVnet2 = Sync-AzVirtualNetworkPeering -Name $peerName2 -VirtualNetworkName $vnet2Name -ResourceGroupName $rgname
1432+
1433+
# Get and Check Peering Sync Levels of Vnet1 and Vnet2 after updating address space of Vnet1 and syncing them
1434+
$peer1 = Get-AzVirtualNetworkPeering -VirtualNetworkName $vnet1Name -Name $peerName -ResourceGroupName $rgname
1435+
$peer2 = Get-AzVirtualNetworkPeering -VirtualNetworkName $vnet2Name -Name $peerName2 -ResourceGroupName $rgname
1436+
1437+
Assert-AreEqual $peer1.PeeringSyncLevel "FullyInSync"
1438+
Assert-AreEqual $peer2.PeeringSyncLevel "FullyInSync"
1439+
1440+
$vnet1 = Get-AzVirtualNetwork -Name $vnet1Name -ResourceGroupName $rgname
1441+
1442+
Assert-AreEqual $peer2.RemoteVirtualNetworkAddressSpace.AddressPrefixesText $vnet1.AddressSpace.AddressPrefixesText
1443+
1444+
# Delete Peer1 and Peer2
1445+
$job = Remove-AzVirtualNetworkPeering -name $peerName -VirtualNetworkName $vnet1Name -ResourceGroupName $rgname -Force -PassThru -AsJob
1446+
$job | Wait-Job
1447+
$delete = $job | Receive-Job
1448+
Assert-AreEqual true $delete
1449+
1450+
$job = Remove-AzVirtualNetworkPeering -name $peerName2 -VirtualNetworkName $vnet2Name -ResourceGroupName $rgname -Force -PassThru -AsJob
1451+
$job | Wait-Job
1452+
$delete = $job | Receive-Job
1453+
Assert-AreEqual true $delete
1454+
1455+
# Delete VirtualNetwork
1456+
$delete = Remove-AzVirtualNetwork -ResourceGroupName $rgname -name $vnet1Name -PassThru -Force
1457+
Assert-AreEqual true $delete
1458+
1459+
$delete = Remove-AzVirtualNetwork -ResourceGroupName $rgname -name $vnet2Name -PassThru -Force
1460+
Assert-AreEqual true $delete
1461+
}
1462+
finally
1463+
{
1464+
# Cleanup
1465+
Clean-ResourceGroup $rgname
1466+
}
1467+
}

0 commit comments

Comments
 (0)