Merge pull request Azure#311 from Azure/ritwikbasu/public

Radius server configuration cmdlets

Author: markcowl

src/ResourceManager/Network/AzureRM.Network.Netcore.psd1

@@ -215,6 +215,8 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'Remove-AzureRmVpnClientRootCertificate', 
                'Set-AzureRmVirtualNetworkGatewayVpnClientConfig', 
                'Get-AzureRmVpnClientPackage', 
+               'New-AzureRmVpnClientConfiguration', 
+               'Get-AzureRmVpnClientConfiguration', 
                'New-AzureRmVirtualNetworkGatewayIpConfig', 
                'Add-AzureRmVirtualNetworkGatewayIpConfig', 
                'Remove-AzureRmVirtualNetworkGatewayIpConfig', 

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -223,6 +223,8 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'Remove-AzureRmVpnClientRootCertificate', 
                'Set-AzureRmVirtualNetworkGatewayVpnClientConfig', 
                'Get-AzureRmVpnClientPackage', 
+               'New-AzureRmVpnClientConfiguration',
+               'Get-AzureRmVpnClientConfiguration',
                'New-AzureRmVirtualNetworkGatewayIpConfig', 
                'Add-AzureRmVirtualNetworkGatewayIpConfig', 
                'Remove-AzureRmVirtualNetworkGatewayIpConfig', 

src/ResourceManager/Network/ChangeLog.md

@@ -24,6 +24,13 @@
     - Updated Set-AzureRmVirtualSubnetConfig: Added optional parameter -ServiceEndpoint
 * Added cmdlet to list endpoint services available in the location
     - Get-AzureRmVirtualNetworkAvailableEndpointService
+* Added the ability to configure external radius based P2S authentication to the following commandlets
+    - New-AzureVirtualNetworkGateway
+    - Set-AzureVirtualNetworkGateway
+    - Set-AzureRmVirtualNetworkGatewayVpnClientConfig
+* Added cmdlet to allow generation of VpnProfiles for external radius based P2S
+    - New-AzureRmVpnClientConfiguration
+	  - Get-AzureRmVpnClientConfiguration
 * Added support for SKU parameter to Public IP Addresses and Load Balancers
     - Updated New-AzureRMLoadBalancer: Added optional parameter -Sku
     - Updated New-AzureRMPublicIpAddress: Added optional parameter -Sku

src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

@@ -539,6 +539,9 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayCRUD.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayP2SVpnProfile.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayActiveActiveFeatureTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
@@ -58,6 +59,13 @@ public void VirtualNetworkGatewayRouteApiTest()
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayBgpRouteApi");
         }
 
+        [Fact()]
+        public void TestVirtualNetworkGatewayP2SVpnProfile()
+        {
+            NetworkResourcesController.NewInstance.RunPsTest(string.Format(
+                "Test-VirtualNetworkGatewayGenerateVpnProfile -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory));
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void VirtualNetworkGatewayIkeV2Test()

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

@@ -147,6 +147,69 @@ function Test-VirtualNetworkGatewayCRUD
      }
 }
 
+<#
+.SYNOPSIS
+Virtual network gateway tests
+#>
+function Test-VirtualNetworkGatewayGenerateVpnProfile
+{
+param 
+    ( 
+        $basedir = ".\" 
+    )
+
+    # Setup
+    $rgname = Get-ResourceName
+    $rname = Get-ResourceName
+    $domainNameLabel = Get-ResourceName
+    $vnetName = Get-ResourceName
+    $publicIpName = Get-ResourceName
+    $vnetGatewayConfigName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/virtualNetworkGateways"
+    $location = Get-ProviderLocation $resourceTypeParent
+	$vpnclientAuthMethod = "EAPTLS"
+    
+    try 
+     {
+      # Create the resource group
+      $resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" } 
+      
+      # Create the Virtual Network
+      $subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
+      $vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
+      $vnet = Get-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
+      $subnet = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
+
+      # Create the publicip
+      $publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel    
+
+      # Create & Get virtualnetworkgateway
+      $vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
+      $actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku VpnGw2
+      $expected = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
+      Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName	
+      Assert-AreEqual $expected.Name $actual.Name	
+      #Assert-AreEqual "Vpn" $expected.GatewayType
+      #Assert-AreEqual "RouteBased" $expected.VpnType
+      
+      # Update P2S VPNClient Configuration
+	  $Secure_String_Pwd = ConvertTo-SecureString "TestRadiusServerPassword" -AsPlainText -Force
+      Set-AzureRmVirtualNetworkGatewayVpnClientConfig -VirtualNetworkGateway $expected -VpnClientAddressPool 200.168.0.0/16 -RadiusServerAddress "TestRadiusServer" -RadiusServerSecret $Secure_String_Pwd 
+      $expected = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
+	  Assert-AreEqual "200.168.0.0/16" $expected.VpnClientConfiguration.VpnClientAddressPool.AddressPrefixes
+
+	  $radiusCertFilePath = $basedir + "\ScenarioTests\Data\ApplicationGatewayAuthCert.cer"
+      $vpnProfilePackageUrl = New-AzureRmVpnClientConfiguration -ResourceGroupName $rgname -name $rname -AuthenticationMethod $vpnclientAuthMethod -RadiusRootCertificateFile $radiusCertFilePath
+	  Write-Host $vpnProfilePackageUrl.VpnProfileSASUrl
+     }
+     finally
+     {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+     }
+}
+
 <#
 .SYNOPSIS
 Virtual network gateway tests

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/TestVirtualNetworkGatewayP2SVpnProfile.json

@@ -330,6 +330,7 @@
     <Compile Include="Models\PSVirtualNetworkPeering.cs" />
     <Compile Include="Models\PSTunnelConnectionHealth.cs" />
     <Compile Include="Models\PSVirtualNetworkUsageCustom.cs" />
+    <Compile Include="Models\PSVpnProfile.cs" />
     <Compile Include="NetworkInterface\EffectiveResources\GetAzureEffectiveNetworkSecurityGroupCommand.cs" />
     <Compile Include="NetworkInterface\EffectiveResources\GetAzureEffectiveRouteTableCommand.cs" />
     <Compile Include="NetworkInterface\IpConfiguration\AddAzureNetworkInterfaceIpConfigCommand.cs" />
@@ -376,6 +377,9 @@
     <Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayAdvertisedRouteCommand.cs" />
     <Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayBgpPeerStatus.cs" />
     <Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayLearnedRouteCommand.cs" />
+    <Compile Include="VirtualNetworkGateway\GetAzureVpnClientConfigurationCommand.cs" />
+    <Compile Include="VirtualNetworkGateway\NewAzureVpnClientConfigurationCommand.cs" />
+    <Compile Include="VirtualNetworkGateway\VirtualNetworkGatewayParameterSets.cs" />
     <Compile Include="VirtualNetwork\TestAzurePrivateIPAddressAvailabilityCmdlet.cs" />
     <Compile Include="PublicIpAddress\GetAzurePublicIpAddressCommand.cs" />
     <Compile Include="PublicIpAddress\NewAzurePublicIpAddressCommand.cs" />