Merge branch 'sssharma/ps-bugbash' of https://github.com/sssharma24/azure-powershell into sssharma/ps-bugbash

Author: sssharma24

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

@@ -1528,16 +1528,16 @@ function Test-NetworkManagerIpamPoolStaticCidrCRUD
         New-AzNetworkManagerIpamPool -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -Name $ipamPoolName -Location $rglocation -AddressPrefix $addressPrefixes
 
         # Create static cidr
-        New-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -PoolName $ipamPoolName -Name $staticCidrName -AddressPrefix $addressPrefixes
+        New-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -IpamPoolName $ipamPoolName -Name $staticCidrName -AddressPrefix $addressPrefixes
 
         # Get static cidr
-        $staticCidr = Get-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -PoolName $ipamPoolName -Name $staticCidrName
+        $staticCidr = Get-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -IpamPoolName $ipamPoolName -Name $staticCidrName
         Assert-NotNull $staticCidr;
         Assert-AreEqual $staticCidrName $staticCidr.Name;
         Assert-AreEqual $staticCidr.Properties.AddressPrefixes[0] $addressPrefixes[0];
 
         # Remove static cidr
-        $job = Remove-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -PoolName $ipamPoolName -Name $staticCidrName -PassThru -Force -AsJob;
+        $job = Remove-AzNetworkManagerIpamPoolStaticCidr -ResourceGroupName $rgName -NetworkManagerName $networkManagerName -IpamPoolName $ipamPoolName -Name $staticCidrName -PassThru -Force -AsJob;
         $job | Wait-Job;
         $removeResult = $job | Receive-Job;
     }

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkManagerTests/NetworkManagerIpamPoolStaticCidrCRUD.json

@@ -67,22 +67,22 @@ public class GetAzNetworkManagerIpamPoolStaticCidrCommand : IpamPoolStaticCidrBa
         [ResourceGroupCompleter]
         [ValidateNotNullOrEmpty]
         [SupportsWildcards]
-        public virtual string PoolName { get; set; }
+        public virtual string IpamPoolName { get; set; }
 
         public override void Execute()
         {
             base.Execute();
             if (this.Name != null)
             {
-                var staticCidr = this.GetStaticCidr(this.ResourceGroupName, this.NetworkManagerName, this.PoolName, this.Name);
+                var staticCidr = this.GetStaticCidr(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName, this.Name);
                 staticCidr.ResourceGroupName = this.ResourceGroupName;
                 staticCidr.NetworkManagerName = this.NetworkManagerName;
                 WriteObject(staticCidr);
             }
             else
             {
                 IPage<StaticCidr> staticCidrPage;
-                staticCidrPage = this.StaticCidrClient.List(this.ResourceGroupName, this.NetworkManagerName, this.PoolName);
+                staticCidrPage = this.StaticCidrClient.List(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName);
 
                 // Get all resources by polling on next page link
                 var staticCidrList = ListNextLink<StaticCidr>.GetAllResourcesByPollingNextLink(staticCidrPage, this.StaticCidrClient.ListNext);

src/Network/Network/NetworkManager/IpamPool/GetAzNetworkManagerIpamPoolStaticCidrCommand.cs

@@ -29,11 +29,11 @@ public IStaticCidrsOperations StaticCidrClient
             }
         }
 
-        public bool IsStaticCidrPresent(string resourceGroupName, string networkManagerName, string poolName, string staticCidrName)
+        public bool IsStaticCidrPresent(string resourceGroupName, string networkManagerName, string ipamPoolName, string staticCidrName)
         {
             try
             {
-                GetStaticCidr(resourceGroupName, networkManagerName, poolName, staticCidrName);
+                GetStaticCidr(resourceGroupName, networkManagerName, ipamPoolName, staticCidrName);
             }
             catch (Microsoft.Azure.Management.Network.Models.CommonErrorResponseException exception)
             {
@@ -49,13 +49,13 @@ public bool IsStaticCidrPresent(string resourceGroupName, string networkManagerN
             return true;
         }
 
-        public PSStaticCidr GetStaticCidr(string resourceGroupName, string networkManagerName, string poolName, string staticCidrName)
+        public PSStaticCidr GetStaticCidr(string resourceGroupName, string networkManagerName, string ipamPoolName, string staticCidrName)
         {
-            var staticCidr = this.StaticCidrClient.Get(resourceGroupName, networkManagerName, poolName, staticCidrName);
+            var staticCidr = this.StaticCidrClient.Get(resourceGroupName, networkManagerName, ipamPoolName, staticCidrName);
             var psStaticCidr = ToPsStaticCidr(staticCidr);
             psStaticCidr.ResourceGroupName = resourceGroupName;
             psStaticCidr.NetworkManagerName = networkManagerName;
-            psStaticCidr.PoolName = poolName;
+            psStaticCidr.PoolName = ipamPoolName;
             psStaticCidr.Name = staticCidrName;
             return psStaticCidr;
         }

src/Network/Network/NetworkManager/IpamPool/IpamPoolStaticCidrBaseCmdlet.cs

@@ -61,7 +61,7 @@ public class NewAzNetworkManagerIpamPoolStaticCidrCommand : IpamPoolStaticCidrBa
          ValueFromPipelineByPropertyName = true,
          HelpMessage = "IP Address Manager Pool resource name.")]
          [ValidateNotNullOrEmpty]
-        public virtual string PoolName { get; set; }
+        public virtual string IpamPoolName { get; set; }
 
         [Parameter(
             Mandatory = false,
@@ -70,7 +70,7 @@ public class NewAzNetworkManagerIpamPoolStaticCidrCommand : IpamPoolStaticCidrBa
         public virtual string NumberOfIPAddressesToAllocate { get; set; }
 
         [Parameter(
-            Mandatory = true,
+            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "List of IP address prefixes of the resource.")]
         public virtual List<string> AddressPrefix { get; set; }
@@ -91,7 +91,7 @@ public class NewAzNetworkManagerIpamPoolStaticCidrCommand : IpamPoolStaticCidrBa
         public override void Execute()
         {
             base.Execute();
-            var present = this.IsStaticCidrPresent(this.ResourceGroupName, this.NetworkManagerName, this.PoolName, this.Name);
+            var present = this.IsStaticCidrPresent(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName, this.Name);
             ConfirmAction(
                 Force.IsPresent,
                 string.Format(Properties.Resources.OverwritingResource, Name),
@@ -128,9 +128,9 @@ private PSStaticCidr CreateStaticCidr()
             // Map to the sdk object
             var staticCidrModel = NetworkResourceManagerProfile.Mapper.Map<MNM.StaticCidr>(staticCidr);
 
-            // Execute the Create Network call string resourceGroupName, string networkManagerName, string poolName, string staticCidrName
-            this.StaticCidrClient.Create(this.ResourceGroupName, this.NetworkManagerName, this.PoolName, this.Name, staticCidrModel);
-            var psStaticCidr = this.GetStaticCidr(this.ResourceGroupName, this.NetworkManagerName, this.PoolName, this.Name);
+            // Execute the Create Network call string resourceGroupName, string networkManagerName, string IpamPoolName, string staticCidrName
+            this.StaticCidrClient.Create(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName, this.Name, staticCidrModel);
+            var psStaticCidr = this.GetStaticCidr(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName, this.Name);
             return psStaticCidr;
         }
     }

src/Network/Network/NetworkManager/IpamPool/NewAzNetworkManagerIpamPoolStaticCidrCommand.cs

@@ -53,7 +53,7 @@ public class RemoveAzNetworkManagerIpamPoolStaticCidrCommand : IpamPoolStaticCid
         [ResourceGroupCompleter]
         [ValidateNotNullOrEmpty]
         [SupportsWildcards]
-        public virtual string PoolName { get; set; }
+        public virtual string IpamPoolName { get; set; }
 
         [Parameter(
            Mandatory = false,
@@ -76,7 +76,7 @@ public override void Execute()
                 Name,
                 () =>
                 {
-                    this.StaticCidrClient.Delete(this.ResourceGroupName, this.NetworkManagerName, this.PoolName, this.Name);
+                    this.StaticCidrClient.Delete(this.ResourceGroupName, this.NetworkManagerName, this.IpamPoolName, this.Name);
                     if (PassThru.IsPresent)
                     {
                         WriteObject(true);

src/Network/Network/NetworkManager/IpamPool/RemoveAzNetworkManagerIpamPoolStaticCidrCommand.cs

@@ -15,14 +15,14 @@ Gets Static Cidr(s) in an IPAM pool.
 ### NoExpand (Default)
 ```
 Get-AzNetworkManagerIpamPoolStaticCidr [-Name <String>] -NetworkManagerName <String>
- -ResourceGroupName <String> -PoolName <String> [-DefaultProfile <IAzureContextContainer>]
+ -ResourceGroupName <String> -IpamPoolName <String> [-DefaultProfile <IAzureContextContainer>]
  [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ### Expand
 ```
 Get-AzNetworkManagerIpamPoolStaticCidr -Name <String> -NetworkManagerName <String> -ResourceGroupName <String>
- -PoolName <String> [-DefaultProfile <IAzureContextContainer>] [-ProgressAction <ActionPreference>]
+ -IpamPoolName <String> [-DefaultProfile <IAzureContextContainer>] [-ProgressAction <ActionPreference>]
  [<CommonParameters>]
 ```
 
@@ -33,12 +33,12 @@ If given a Static Cidr name, the **Get-AzNetworkManagerIpamPoolStaticCidr** cmdl
 
 ### Example 1
 ```powershell
-Get-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -PoolName testPool
+Get-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -IpamPoolName testPool
 ```
 
 ```output
 Name               : testStaticCidr
-PoolName           : testPool
+IpamPoolName           : testPool
 ResourceGroupName  : testRG
 NetworkManagerName : testNM
 Properties         : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSStaticCidrProperties
@@ -54,12 +54,12 @@ Gets static Cidr with name 'testStaticCidr'
 
 ### Example 2
 ```powershell
-Get-AzNetworkManagerIpamPoolStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -PoolName testPool
+Get-AzNetworkManagerIpamPoolStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -IpamPoolName testPool
 ```
 
 ```output
 Name               : New
-PoolName           :
+IpamPoolName           :
 ResourceGroupName  : testRG
 NetworkManagerName : testNM
 Properties         : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSStaticCidrProperties
@@ -72,7 +72,7 @@ Id                 : /subscriptions/00000000-0000-0000-0000-000000000000/resourc
                      /testPool/staticCidrs/New
 
 Name               : New2
-PoolName           :
+IpamPoolName           :
 ResourceGroupName  : testRG
 NetworkManagerName : testNM
 Properties         : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSStaticCidrProperties
@@ -85,7 +85,7 @@ Id                 : /subscriptions/00000000-0000-0000-0000-000000000000/resourc
                      /testPool/staticCidrs/New2
 
 Name               : On-Prem
-PoolName           :
+IpamPoolName           :
 ResourceGroupName  : testRG
 NetworkManagerName : testNM
 Properties         : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSStaticCidrProperties
@@ -158,7 +158,7 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: True
 ```
 
-### -PoolName
+### -IpamPoolName
 The pool resource name.
 
 ```yaml

src/Network/Network/help/Get-AzNetworkManagerIpamPoolStaticCidr.md

@@ -148,27 +148,85 @@ Gets list of network manager verifier workspace reachability analysis runs for '
 
 ### Example 2
 ```powershell
-Get-AzNetworkManagerVerifierWorkspaceReachabilityAnalysisRun -NetworkManagerName "testNM" -ResourceGroupName "testRG" -VerifierWorkspaceName "testVNV" -Name "testrun"
+$run = Get-AzNetworkManagerVerifierWorkspaceReachabilityAnalysisRun -NetworkManagerName "NetworkManagerTest" -ResourceGroupName "ResourceGroupTest" -VerifierWorkspaceName "VNVTest" -Name "demorun"
+$run.Properties
 ```
 
 ```output
-Name                  : testrun
-VerifierWorkspaceName : testVNV
-ResourceGroupName     : testRG
-NetworkManagerName    : testNM
-Properties            : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSReachabilityAnalysisRunProperties
-Type                  : Microsoft.Network/networkManagers/verifierWorkspaces/reachabilityAnalysisRuns
-SystemData            : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSSystemData
-SystemDataText        : {
-                          "CreatedBy": "[email protected]",
-                          "CreatedByType": "User",
-                          "CreatedAt": "2024-09-19T16:01:54.313026Z",
-                          "LastModifiedBy": "[email protected]",
-                          "LastModifiedByType": "User",
-                          "LastModifiedAt": "2024-09-19T16:02:07.4222816Z"
+Description    :
+IntentId       : /subscriptions/f0dc2b34-dfad-40e4-83e0-2309fed8d00b/resourceGroups/ResourceGroupTest/providers/Microsoft.Netw
+                 ork/networkManagers/NetworkManagerTest/verifierWorkspaces/VNVTest/reachabilityAnalysisIntents/demoIntent1
+IntentContent  : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSIntentContent
+AnalysisResult : {"resultOutcome":"NoPacketsReached","unreachedTrace":"[{\"name\":\"default\",\"resourceId\":\"/subscri
+                 ptions/00000000-0000-0000-0000-000000000000/resourceGroups/testResources/providers/Microso
+                 ft.Network/virtualNetworks/vnetVerifierTesting-vnet/subnets/default\",\"resourceType\":\"Microsoft.Net
+                 work/virtualNetworks/subnets\",\"packet\":{\"destinationAddress\":\"::\",\"destinationPort\":\"0\",\"s
+                 ourceAddress\":\"::\",\"sourcePort\":\"0\",\"protocol\":\"TCP\"},\"explanation\":{\"description\":\"Pa
+                 cked dropped at subnet as subnet does not have a ip prefix for the analysis IP
+                 version.\",\"explanationCode\":\"NO_SUBNET_PREFIX\"}}]"}
+ErrorMessage   :
+```
+
+```powershell
+$run.Properties.IntentContent.IpTraffic | Format-List *
+```
+
+```output
+SourceResourceId      : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testResources/providers/Microsoft.Network/virtualNetworks/vnetVerifi
+                        erTesting-vnet/subnets/default
+DestinationResourceId : internet
+IpTraffic             : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSIPTraffic
+IntentContentText     : {
+                          "SourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testResources/providers/Microsoft.Network/vir
+                        tualNetworks/vnetVerifierTesting-vnet/subnets/default",
+                          "DestinationResourceId": "internet",
+                          "IpTraffic": {
+                            "SourceIps": [
+                              "::"
+                            ],
+                            "DestinationIps": [
+                              "::"
+                            ],
+                            "SourcePorts": [
+                              "*"
+                            ],
+                            "DestinationPorts": [
+                              "*"
+                            ],
+                            "Protocols": [
+                              "TCP"
+                            ]
+                          }
                         }
-Id                    : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Network/networkManagers/testNM/verifierW
-                        orkspaces/testVNV/reachabilityAnalysisRuns/testrun
+```
+
+```powershell
+$run.Properties.IntentContent.IpTraffic | Format-List *
+```
+
+```output
+SourceIps        : {::}
+DestinationIps   : {::}
+SourcePorts      : {*}
+DestinationPorts : {*}
+Protocols        : {TCP}
+IpTrafficText    : {
+                     "SourceIps": [
+                       "::"
+                     ],
+                     "DestinationIps": [
+                       "::"
+                     ],
+                     "SourcePorts": [
+                       "*"
+                     ],
+                     "DestinationPorts": [
+                       "*"
+                     ],
+                     "Protocols": [
+                       "TCP"
+                     ]
+                   }
 ```
 
 Gets network manager verifier workspace reachability analysis run for 'testrun'.

src/Network/Network/help/Get-AzNetworkManagerVerifierWorkspaceReachabilityAnalysisRun.md

@@ -13,7 +13,7 @@ Creates a new Static Cidr.
 ## SYNTAX
 
 ```
-New-AzNetworkManagerIpamPoolStaticCidr -Name <String> -NetworkManagerName <String> -ResourceGroupName <String> -PoolName <String> -AddressPrefix <System.Collections.Generic.List`1[System.String]>
+New-AzNetworkManagerIpamPoolStaticCidr -Name <String> -NetworkManagerName <String> -ResourceGroupName <String> -IpamPoolName <String> -AddressPrefix <System.Collections.Generic.List`1[System.String]>
  [-NumberOfIPAddressesToAllocate <String>] [-Description <String>] [-Force]
  [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
@@ -26,14 +26,14 @@ The **New-AzNetworkManagerIpamPoolStaticCidr** cmdlet creates a new Static Cidr
 
 ### Example 1
 ```powershell
-New-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -PoolName testCmdletPool -AddressPrefix @("10.0.0.0/28")
+New-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -IpamPoolName testCmdletPool -AddressPrefix @("10.0.0.0/28")
 ```
 
 ```output
 
 
 Name               : testStaticCidr
-PoolName           : testCmdletPool
+IpamPoolName           : testCmdletPool
 ResourceGroupName  : testRG
 NetworkManagerName : testNM
 Properties         : Microsoft.Azure.Commands.Network.Models.NetworkManager.PSStaticCidrProperties
@@ -171,7 +171,7 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -PoolName
+### -IpamPoolName
 IP Address Manager Pool resource name.
 
 ```yaml

src/Network/Network/help/New-AzNetworkManagerIpamPoolStaticCidr.md

@@ -14,7 +14,7 @@ Removes a Static Cidr.
 
 ```
 Remove-AzNetworkManagerIpamPoolStaticCidr -Name <String> -NetworkManagerName <String>
- -ResourceGroupName <String> -PoolName <String> [-Force] [-PassThru] [-AsJob]
+ -ResourceGroupName <String> -IpamPoolName <String> [-Force] [-PassThru] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -26,7 +26,7 @@ The **Remove-AzNetworkManagerIpamPoolStaticCidr** cmdlet removes the given Stati
 
 ### Example 1
 ```powershell
-Remove-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -PoolName testPool
+Remove-AzNetworkManagerIpamPoolStaticCidr -Name testStaticCidr -NetworkManagerName testNM -ResourceGroupName testRG -IpamPoolName testPool
 ```
 
 ```output
@@ -128,7 +128,7 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -PoolName
+### -IpamPoolName
 The pool resource name.
 
 ```yaml