NAT Port Range for VPN (#16133)

* inital commits

* fix resx

* VNG cmdlet

* md files

* rename

* UT update

* UTfix

* UTupdate

* UT fix

* examples

Author: henry416

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

@@ -189,24 +189,28 @@ function Test-CortexCRUD
 		#Assert-AreEqual $false $createdVpnGateway.EnableBgpRouteTranslationForNat
 
 		# Create one more NATRule using New-AzVpnGatewayNatRule
-		New-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3" -Type "Dynamic" -Mode "IngressSnat" -InternalMapping "192.168.1.0/26" -ExternalMapping "10.0.1.0/26"
+		New-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3" -Type "Static" -Mode "IngressSnat" -InternalMapping "192.168.1.0/26" -ExternalMapping "10.0.1.0/26" -InternalPortRange @("100-100") -ExternalPortRange @("200-200")
 		$natRule = Get-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3"
 		Assert-AreEqual "NatRule3" $natRule.Name
-		Assert-AreEqual "Dynamic" $natRule.VpnGatewayNatRulePropertiesType
+		Assert-AreEqual "Static" $natRule.VpnGatewayNatRulePropertiesType
 		Assert-AreEqual "IngressSnat" $natRule.Mode
 		Assert-AreEqual 1 $natRule.InternalMappings.Count		
 		Assert-AreEqual "192.168.1.0/26" $natRule.InternalMappings[0].AddressSpace
 		Assert-AreEqual 1 $natRule.ExternalMappings.Count		
 		Assert-AreEqual "10.0.1.0/26" $natRule.ExternalMappings[0].AddressSpace
+		Assert-AreEqual "100-100" $natRule.InternalMappings[0].PortRange
+		Assert-AreEqual "200-200" $natRule.ExternalMappings[0].PortRange
 		Assert-AreEqual 0 $natRule.IngressVpnSiteLinkConnections.Count	
 		Assert-AreEqual 0 $natRule.EgressVpnSiteLinkConnections.Count
 		Assert-AreEqual "Succeeded" $natRule.ProvisioningState		
 
-		Update-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3" -InternalMapping "192.168.2.0/26" -ExternalMapping "10.0.2.0/26"
+		Update-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3" -InternalMapping "192.168.2.0/26" -ExternalMapping "10.0.2.0/26" -InternalPortRange @("300-300") -ExternalPortRange @("400-400")
 		$natRule = Get-AzVpnGatewayNatRule -ResourceGroupName $rgName -ParentResourceName $vpnGatewayName -Name "NatRule3"
 		Assert-AreEqual "NatRule3" $natRule.Name
 		Assert-AreEqual "192.168.2.0/26" $natRule.InternalMappings[0].AddressSpace
 		Assert-AreEqual "10.0.2.0/26" $natRule.ExternalMappings[0].AddressSpace
+		Assert-AreEqual "300-300" $natRule.InternalMappings[0].PortRange
+		Assert-AreEqual "400-400" $natRule.ExternalMappings[0].PortRange
 		Assert-AreEqual "Succeeded" $natRule.ProvisioningState	
 		#Assert-AreEqual $True $vpnGateway.IsRoutingPreferenceInternet
 

src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

@@ -1276,7 +1276,7 @@ function Test-VirtualNetworkGatewayNatRuleCRUD
       # Create & Get virtualnetworkgateway with NatRules
       $vnetIpConfig = New-AzVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
       $ipconfigurationId = $vnetIpConfig.id
-      $natRule = New-AzVirtualNetworkGatewayNatRule -Name "natRule1" -Type "Static" -Mode "IngressSnat" -InternalMapping @("25.0.0.0/16") -ExternalMapping @("30.0.0.0/16")
+      $natRule = New-AzVirtualNetworkGatewayNatRule -Name "natRule1" -Type "Static" -Mode "IngressSnat" -InternalMapping @("25.0.0.0/16") -ExternalMapping @("30.0.0.0/16") -InternalPortRange @("100-100") -ExternalPortRange @("200-200")
       $job = New-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -GatewaySku VpnGw2 -NatRule $natRule -EnableBgpRouteTranslationForNat -AsJob
 	  $job | Wait-Job
 	  $actual = $job | Receive-Job
@@ -1290,19 +1290,32 @@ function Test-VirtualNetworkGatewayNatRuleCRUD
       # Updates & Get virtualnetworkgateway with NatRules
       $gateway = Get-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
       $vngNatRules = $gateway.NatRules
-      $natRule = New-AzVirtualNetworkGatewayNatRule -Name "natRule2" -Type "Static" -Mode "EgressSnat" -InternalMapping @("20.0.0.0/16") -ExternalMapping @("50.0.0.0/16")
+      $natRule = New-AzVirtualNetworkGatewayNatRule -Name "natRule2" -Type "Static" -Mode "EgressSnat" -InternalMapping @("20.0.0.0/16") -ExternalMapping @("50.0.0.0/16") -InternalPortRange @("300-300") -ExternalPortRange @("400-400")
       $vngNatRules.Add($natrule)
       $updatedGateway = Set-AzVirtualNetworkGateway -VirtualNetworkGateway $gateway -NatRule $vngNatRules
       Assert-AreEqual 2 @($updatedGateway.NatRules).Count
+      Assert-AreEqual "20.0.0.0/16" $updatedGateway.NatRules[1].InternalMappings[0].AddressSpace 
+      Assert-AreEqual "50.0.0.0/16" $updatedGateway.NatRules[1].ExternalMappings[0].AddressSpace
+      Assert-AreEqual "300-300" $updatedGateway.NatRules[1].InternalMappings[0].PortRange 
+      Assert-AreEqual "400-400" $updatedGateway.NatRules[1].ExternalMappings[0].PortRange
 
 	  # List virtualNetworkGateways NatRules
       $list = Get-AzVirtualNetworkGatewayNatRule -ResourceGroupName $rgname -ParentResourceName $rname
       Assert-AreEqual 2 @($list).Count
 
       # update virtualNetworkGateways NatRule
       $natrule = Get-AzVirtualNetworkGatewayNatRule -ResourceGroupName $rgname -ParentResourceName $rname -Name "natRule2"
-      $updatedNatRule = Update-AzVirtualNetworkGatewayNatRule -InputObject $natrule -ExternalMapping @("40.0.0.0/16")
+      Assert-AreEqual "20.0.0.0/16" $natrule.InternalMappings[0].AddressSpace 
+      Assert-AreEqual "50.0.0.0/16" $natrule.ExternalMappings[0].AddressSpace
+      Assert-AreEqual "300-300" $natrule.InternalMappings[0].PortRange 
+      Assert-AreEqual "400-400" $natrule.ExternalMappings[0].PortRange
+
+      $updatedNatRule = Update-AzVirtualNetworkGatewayNatRule -InputObject $natrule -ExternalMapping @("40.0.0.0/16") -ExternalPortRange @("500-500")
       Assert-AreEqual "Succeeded" $updatedNatRule.ProvisioningState
+      Assert-AreEqual "20.0.0.0/16" $updatedNatRule.InternalMappings[0].AddressSpace 
+      Assert-AreEqual "40.0.0.0/16" $updatedNatRule.ExternalMappings[0].AddressSpace 
+      Assert-AreEqual "300-300" $updatedNatRule.InternalMappings[0].PortRange 
+      Assert-AreEqual "500-500" $updatedNatRule.ExternalMappings[0].PortRange
 
       # Delete virtualNetworkGatewayNatRules
       $delete = Remove-AzVirtualNetworkGatewayNatRule -ResourceGroupName $rgname -ParentResourceName $rname -Name natRule1 -PassThru -Force