Skip to content

Commit a8680b4

Browse files
varunkosgiNoriZCsssharma24VeryEarly
authored
Add etag property to ipam pool and verifier workspace (#27103)
Co-authored-by: NoriZC <[email protected]> Co-authored-by: Sonalli S Sharma <[email protected]> Co-authored-by: Yabo Hu <[email protected]>
1 parent 1b023bc commit a8680b4

12 files changed

+1023
-888
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,12 +1460,25 @@ function Test-NetworkManagerIpamPoolCRUD
14601460
Assert-AreEqual $rglocation $ipamPool.Location;
14611461
Assert-AreEqual $ipamPool.Properties.AddressPrefixes[0] $addressPrefixes[0];
14621462
Assert-AreEqual $ipamPool.Tags.Count 1;
1463+
Assert-NotNull $ipamPool.Etag;
1464+
1465+
# List pools
1466+
$listPools = Get-AzNetworkManagerIpamPool -ResourceGroupName $rgname -NetworkManagerName $networkManagerName
1467+
Assert-AreEqual 1 @($listPools).Count
1468+
Assert-AreEqual $listPools[0].ResourceGroupName $ipamPool.ResourceGroupName
1469+
Assert-AreEqual $listPools[0].Name $ipamPool.Name
1470+
Assert-AreEqual $listPools[0].Location $ipamPool.Location
1471+
Assert-AreEqual $listPools[0].ProvisioningState $ipamPool.ProvisioningState
1472+
Assert-AreEqual $listPools[0].Etag $ipamPool.Etag
14631473

14641474
# Update access
14651475
$ipamPool.Properties.AddressPrefixes.Add("11.0.0.0/8");
14661476
$newIpamPool = Set-AzNetworkManagerIpamPool -InputObject $ipamPool
14671477
Assert-AreEqual $newIpamPool.Properties.AddressPrefixes[0] "10.0.0.0/8";
14681478
Assert-AreEqual $newIpamPool.Properties.AddressPrefixes[1] "11.0.0.0/8";
1479+
1480+
# Etag should change after update
1481+
Assert-True {$newIpamPool.Etag -ne $ipamPool.Etag};
14691482

14701483
# Get Pool Usage
14711484
$poolUsage = Get-AzNetworkManagerIpamPoolUsage -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -IpamPoolName $ipamPoolName
@@ -1582,6 +1595,8 @@ function Test-NetworkManagerVerifierWorkspaceReachabilityAnalysisRunCRUD
15821595
Assert-AreEqual $verifierWorkspaceName $verifierWorkspace.Name;
15831596
Assert-AreEqual $rglocation $verifierWorkspace.Location;
15841597
Assert-AreEqual $verifierWorkspace.Tags.Count 1;
1598+
Assert-NotNull $verifierWorkspace.Etag;
1599+
$oldEtag = $verifierWorkspace.Etag;
15851600

15861601
# Get verifier workspace list
15871602
$verifierWorkspaceList = Get-AzNetworkManagerVerifierWorkspace -ResourceGroupName $rgName -NetworkManagerName $networkManagerName
@@ -1594,6 +1609,14 @@ function Test-NetworkManagerVerifierWorkspaceReachabilityAnalysisRunCRUD
15941609
Assert-NotNull $verifierWorkspace
15951610
Assert-AreEqual $resourceId $verifierWorkspace.Id
15961611

1612+
# Set by InputObject
1613+
$verifierWorkspace.Properties.Description = "A different description."
1614+
$verifierWorkspace = Set-AzNetworkManagerVerifierWorkspace -InputObject $verifierWorkspace
1615+
Assert-AreEqual "A different description." $verifierWorkspace.Properties.Description
1616+
1617+
#Etag should change after update
1618+
Assert-True {$verifierWorkspace.Etag -ne $oldEtag}
1619+
15971620
# Create analysis intent
15981621
$sourcePortList = @("100")
15991622
$destinationPortList = @("99")

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkManagerTests/NetworkManagerIpamPoolCRUD.json

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

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkManagerTests/NetworkManagerVerifierWorkspaceReachabilityAnalysisRunCRUD.json

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

‎src/Network/Network/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
- `Get-AzNetworkVirtualAppliance`
3939
* Added cmdlet to retrieve boot diagnostic logs for a given NetworkVirtualAppliance VM instance:
4040
- `Get-AzNetworkVirtualApplianceBootDiagnostics`
41+
* Added etag property to Azure Virtual Network Manager -> IpamPool, VerifierWorkspace data models
4142
* Onboarded ExpressRoute cmdlets to manage Microsoft Peering Advertised prefix validation:
4243
- `Get-AzExpressRouteCircuitMicrosoftPeeringPrefixConfig`
4344
- `Add-AzExpressRouteCircuitMicrosoftPeeringPrefixConfig`

‎src/Network/Network/Models/NetworkManager/PSIpamPoolBaseResoure.cs renamed to ‎src/Network/Network/Models/NetworkManager/PSIpamPoolBaseResource.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717

1818
namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
1919
{
20-
public class PSIpamPoolBaseResource : PSResourceId
20+
public class PSIpamPoolBaseResource : PSChildResource
2121
{
22-
[Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 2)]
23-
public string Name { get; set; }
24-
2522
[Ps1Xml(Label = "ResourceGroupName", Target = ViewControl.Table, Position = 0)]
2623
public string ResourceGroupName { get; set; }
2724

28-
[Ps1Xml(Label = "NetworkManagerName", Target = ViewControl.Table, Position = 1)]
25+
[Ps1Xml(Label = "NetworkManagerName", Target = ViewControl.Table, Position = 3)]
2926
public string NetworkManagerName { get; set; }
3027

3128
public string Type { get; set; }

‎src/Network/Network/Models/NetworkManager/PSVerifierWorkspaceBaseResource.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717

1818
namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
1919
{
20-
public class PSVerifierWorkspaceBaseResource : PSResourceId
20+
public class PSVerifierWorkspaceBaseResource : PSChildResource
2121
{
22-
[Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 2)]
23-
public string Name { get; set; }
24-
22+
2523
[Ps1Xml(Label = "ResourceGroupName", Target = ViewControl.Table, Position = 0)]
2624
public string ResourceGroupName { get; set; }
2725

28-
[Ps1Xml(Label = "NetworkManagerName", Target = ViewControl.Table, Position = 1)]
26+
[Ps1Xml(Label = "NetworkManagerName", Target = ViewControl.Table, Position = 3)]
2927
public string NetworkManagerName { get; set; }
3028

3129
public string Type { get; set; }

‎src/Network/Network/help/Get-AzNetworkManagerIpamPool.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ PropertiesText : {
6060
Name : testPool
6161
ResourceGroupName : testRG
6262
NetworkManagerName : testNM
63+
Etag : "00000000-0000-0000-0000-000000000000"
6364
Type : Microsoft.Network/networkManagers/ipamPools
6465
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
6566
SystemDataText : {
@@ -103,6 +104,7 @@ PropertiesText : {
103104
Name : cusPool
104105
ResourceGroupName : testRG
105106
NetworkManagerName : cusNM
107+
Etag : "00000000-0000-0000-0000-000000000000"
106108
Type : Microsoft.Network/networkManagers/ipamPools
107109
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
108110
SystemDataText : {
@@ -134,6 +136,7 @@ PropertiesText : {
134136
Name : sm_cus_pool1_0911
135137
ResourceGroupName : testRG
136138
NetworkManagerName : cusNM
139+
Etag : "00000000-0000-0000-0000-000000000000"
137140
Type : Microsoft.Network/networkManagers/ipamPools
138141
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
139142
SystemDataText : {

‎src/Network/Network/help/Get-AzNetworkManagerVerifierWorkspace.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Name : AmeWorkspace
5353
ResourceGroupName : testRG
5454
NetworkManagerName : testNM
5555
Type : Microsoft.Network/networkManagers/verifierWorkspaces
56+
Etag : "\"00000000-0000-0000-0000-000000000000\""
5657
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
5758
SystemDataText : {
5859
"CreatedBy": "[email protected]",
@@ -77,6 +78,7 @@ Name : ameWorkspace2
7778
ResourceGroupName : testRG
7879
NetworkManagerName : testNM
7980
Type : Microsoft.Network/networkManagers/verifierWorkspaces
81+
Etag : "\"00000000-0000-0000-0000-000000000000\""
8082
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
8183
SystemDataText : {
8284
"CreatedBy": "[email protected]",
@@ -101,6 +103,7 @@ Name : testworkspaceame1
101103
ResourceGroupName : testRG
102104
NetworkManagerName : testNM
103105
Type : Microsoft.Network/networkManagers/verifierWorkspaces
106+
Etag : "\"00000000-0000-0000-0000-000000000000\""
104107
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
105108
SystemDataText : {
106109
"CreatedBy": "[email protected]",
@@ -125,6 +128,7 @@ Name : testVNV
125128
ResourceGroupName : testRG
126129
NetworkManagerName : testNM
127130
Type : Microsoft.Network/networkManagers/verifierWorkspaces
131+
Etag : "\"00000000-0000-0000-0000-000000000000\""
128132
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
129133
SystemDataText : {
130134
"CreatedBy": "[email protected]",
@@ -149,6 +153,7 @@ Name : testVerifierWorkspace5
149153
ResourceGroupName : testRG
150154
NetworkManagerName : testNM
151155
Type : Microsoft.Network/networkManagers/verifierWorkspaces
156+
Etag : "\"00000000-0000-0000-0000-000000000000\""
152157
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
153158
SystemDataText : {
154159
"CreatedBy": "[email protected]",
@@ -173,6 +178,7 @@ Name : testVerifierWorkspace8
173178
ResourceGroupName : testRG
174179
NetworkManagerName : testNM
175180
Type : Microsoft.Network/networkManagers/verifierWorkspaces
181+
Etag : "\"00000000-0000-0000-0000-000000000000\""
176182
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
177183
SystemDataText : {
178184
"LastModifiedBy": "[email protected]",
@@ -194,6 +200,7 @@ Name : testVerifierWorkspace9
194200
ResourceGroupName : testRG
195201
NetworkManagerName : testNM
196202
Type : Microsoft.Network/networkManagers/verifierWorkspaces
203+
Etag : "\"00000000-0000-0000-0000-000000000000\""
197204
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
198205
SystemDataText : {
199206
"CreatedBy": "[email protected]",
@@ -228,6 +235,7 @@ Name : testVerifierWorkspace9
228235
ResourceGroupName : testRG
229236
NetworkManagerName : testNM
230237
Type : Microsoft.Network/networkManagers/verifierWorkspaces
238+
Etag : "\"00000000-0000-0000-0000-000000000000\""
231239
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
232240
SystemDataText : {
233241
"CreatedBy": "[email protected]",

‎src/Network/Network/help/New-AzNetworkManagerIpamPool.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ PropertiesText : {
4848
Name : testCmdletPool
4949
ResourceGroupName : testRGg
5050
NetworkManagerName : testNM
51+
Etag : "00000000-0000-0000-0000-000000000000"
5152
Type : Microsoft.Network/networkManagers/ipamPools
5253
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
5354
SystemDataText : {

‎src/Network/Network/help/New-AzNetworkManagerVerifierWorkspace.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Name : testVerifierWorkspace10
4141
ResourceGroupName : testRG
4242
NetworkManagerName : testNM
4343
Type : Microsoft.Network/networkManagers/verifierWorkspaces
44+
Etag : "\"00000000-0000-0000-0000-000000000000\""
4445
SystemData : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
4546
SystemDataText : {
4647
"CreatedBy": "[email protected]",

0 commit comments

Comments
 (0)