Merge pull request Azure#9584 from abjai/urlrewrite

Application Gateway New-AzApplicationGatewayProbeConfig command update for supporting custom port in Probe

Author: MiYanni

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

@@ -638,7 +638,7 @@ function Test-ApplicationGatewayCRUDRewriteRuleSet
 		$certFilePath = $basedir + "/ScenarioTests/Data/ApplicationGatewayAuthCert.cer"
 		$trustedRoot01 = New-AzApplicationGatewayTrustedRootCertificate -Name $trustedRootCertName -CertificateFile $certFilePath
 		$pool = New-AzApplicationGatewayBackendAddressPool -Name $poolName -BackendIPAddresses www.microsoft.com, www.bing.com
-		$probeHttp = New-AzApplicationGatewayProbeConfig -Name $probeHttpName -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8
+		$probeHttp = New-AzApplicationGatewayProbeConfig -Name $probeHttpName -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8 -port 1234
 		$poolSetting01 = New-AzApplicationGatewayBackendHttpSettings -Name $poolSetting01Name -Port 443 -Protocol Https -Probe $probeHttp -CookieBasedAffinity Enabled -PickHostNameFromBackendAddress -TrustedRootCertificate $trustedRoot01
 
 		#Rewrite Rule Set
@@ -754,6 +754,19 @@ function Test-ApplicationGatewayCRUDRewriteRuleSet
 		Assert-AreEqual $sku01.Name Standard_v2
 		Assert-AreEqual $sku01.Tier Standard_v2
 
+		# check probe
+		$probe01 = Get-AzApplicationGatewayProbeConfig -ApplicationGateway $getgw01
+		Assert-NotNull $probe01
+		Assert-AreEqual $probe01.Port 1234
+		Assert-AreEqual $probe01.Host "probe.com"
+		Assert-AreEqual $probe01.Path "/path/path.htm"
+		Assert-AreEqual $probe01.Interval 89
+		Assert-AreEqual $probe01.Timeout 88
+		Assert-AreEqual $probe01.UnhealthyThreshold 8
+
+		Assert-ThrowsLike { Set-AzApplicationGatewayProbeConfig -ApplicationGateway $getgw01 -Name "fakeName" -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8 -port 1234} "*does not exist*"
+		Assert-ThrowsLike { Add-AzApplicationGatewayProbeConfig -ApplicationGateway $getgw01 -Name $probeHttpName -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8 -port 1234} "*already exists*"
+
 		# Stop Application Gateway
 		$getgw1 = Stop-AzApplicationGateway -ApplicationGateway $getgw01
 

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUDRewriteRuleSet.json

@@ -74,6 +74,12 @@ public class AzureApplicationGatewayProbeConfigBase : NetworkBaseCmdlet
         [ValidateRange(0, int.MaxValue)]
         public int MinServers { get; set; }
 
+        [Parameter(
+           Mandatory = false,
+           HelpMessage = "Port that is used for probing the backend server")]
+        [ValidateRange(1, 65535)]
+        public int Port { get; set; }
+
         [Parameter(
            Mandatory = false,
            HelpMessage = "Body that must be contained in the health response. Default value is empty")]
@@ -96,6 +102,10 @@ public PSApplicationGatewayProbe NewObject()
             }
             probe.MinServers = this.MinServers;
             probe.Match = this.Match;
+            if (this.Port != 0)
+            {
+                probe.Port = this.Port;
+            }
 
             probe.Id =
                 ApplicationGatewayChildResourceHelper.GetResourceNotSetId(

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUDRewriteRuleSetWithConditions.json

@@ -44,6 +44,8 @@
         - New-AzLoadBalancerFrontendIpConfig
         - Add-AzLoadBalancerFrontendIpConfig
         - Set-AzLoadBalancerFrontendIpConfig
+* Application Gateway New-AzApplicationGatewayProbeConfig command update for supporting custom port in Probe
+    - Updated New-AzApplicationGatewayProbeConfig: Added optional parameter Port which is used for probing backend server. This parameter is applicable for Standard_V2 and WAF_V2 SKU.
 
 ## Version 1.11.0
 * Added `RoutingPreference` to public ip tags

src/Network/Network/ApplicationGateway/Probe/AzureApplicationGatewayProbeConfigBase.cs

@@ -36,6 +36,8 @@ public class PSApplicationGatewayProbe : PSChildResource
         public bool? PickHostNameFromBackendHttpSettings { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public int? MinServers { get; set; }
+        [Ps1Xml(Target = ViewControl.Table)]
+        public int? Port { get; set; }
         public PSApplicationGatewayProbeHealthResponseMatch Match { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }

src/Network/Network/ChangeLog.md

@@ -16,7 +16,7 @@ Creates a health probe.
 New-AzApplicationGatewayProbeConfig -Name <String> -Protocol <String> [-HostName <String>] -Path <String>
  -Interval <Int32> -Timeout <Int32> -UnhealthyThreshold <Int32> [-PickHostNameFromBackendHttpSettings]
  [-MinServers <Int32>] [-Match <PSApplicationGatewayProbeHealthResponseMatch>]
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>] [-Port <Int32>]
 ```
 
 ## DESCRIPTION
@@ -210,6 +210,20 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Port
+Specifies the port used for probing backend servers.
+
+```yaml
+Type: System.Int32
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).