Merge pull request Azure#6094 from dedhar/preview

Add PS CmdLets for Express Route Circuit Connection Resource

Author: vladimir-shcherbakov

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -319,7 +319,10 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'New-AzureRmPublicIpTag',
                'New-AzureRmDdosProtectionPlan',
                'Get-AzureRmDdosProtectionPlan',
-               'Remove-AzureRmDdosProtectionPlan'
+               'Remove-AzureRmDdosProtectionPlan',
+               'Add-AzureRmExpressRouteCircuitConnectionConfig',
+               'Get-AzureRmExpressRouteCircuitConnectionConfig',
+               'Remove-AzureRmExpressRouteCircuitConnectionConfig'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Network/ChangeLog.md

@@ -23,6 +23,12 @@
 * Bump up Network SDK version from 18.0.0-preview to 19.0.0-preview
 
 ## Version 6.0.0
+* Added cmdlet to add a new circuit connection to an existing express route circuit.
+    - Add-AzureRmExpressRouteCircuitConnectionConfig
+* Added cmdlet to remove a circuit connection from an existing express route circuit.
+    - Remove-AzureRmExpressRouteCircuitConnectionConfig
+* Added cmdlet to retrieve a circuit connection
+    - Get-AzureRmExpressRouteCircuitConnectionConfig
 * Bump up network sdk version from 17.0.0.preview to 18.0.0.preview
 * Rerecord all network tests with latest sdk version* Set minimum dependency of module to PowerShell 5.0
 * Add support for DDoS protection plan resource

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

@@ -329,6 +329,7 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteBgpServiceCommunitiesGet.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitConnectionCRUD.json" />
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalHighlyAvailableBasicSku.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -62,27 +62,25 @@ function Get-ProviderLocation($provider)
 		{  
 			$type = $provider.Substring($namespace.Length + 1)  
 			$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}  
-  
+
 			if ($location -eq $null) 
 			{  
 				return "West US"  
 			} 
             else 
-			{  
-			if($location.Locations[0] -eq "West US")
-			{ 
-				return $location.Locations[1]
-			}
-			else
 			{
-				return $location.Locations[0]
+				if($location.Locations[0] -eq "West US")
+				{ 
+					return $location.Locations[1]
 				}
-			}  
-		}
-		
+				else
+				{
+					return $location.Locations[0]
+				} 
+			}
+		}	
 		return "West US"
 	}
-
 	return "WestUS"
 }
 

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

@@ -74,5 +74,12 @@ public void TestExpressRouteRouteFilterCRUD()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteRouteFilters");
         }
+
+        [Fact(Skip = "Express Route Circuits need to be manually provisioned by Service Providers and the whole setup can't be automated.")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestExpressRouteCircuitConnectionCRUD()
+        {
+            NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitConnectionCRUD");
+        }
     }
 }

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

@@ -540,3 +540,59 @@ function Test-ExpressRouteCircuitAuthorizationCRUD
     }
 }
 
+<#
+.SYNOPSIS
+Tests ExpressRouteCircuitConnectionCRUD.
+#>
+function Test-ExpressRouteCircuitConnectionCRUD
+{
+	$circuitName = "dedharcktpeer"
+	$groupName = "dedharpspeer"
+	$peerCircuitId = "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharpsinit/providers/Microsoft.Network/expressRouteCircuits/dedhar-cktinit/peerings/AzurePrivatePeering"
+	$addressPrefix = "60.0.0.0/29"
+	$authorizationKey = "aaf441cf-4409-48ee-8e2d-a39cc7e428a8"
+	$connectionName = "transit"
+
+	try
+	{
+		#Get Express Route Circuit Resource
+		$ckt = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $groupName
+		$ckt
+
+		#Create the circuit connection Resource
+		Add-AzureRmExpressRouteCircuitConnectionConfig -Name $connectionName -ExpressRouteCircuit $ckt -PeerExpressRouteCircuitPeering $peerCircuitId -AddressPrefix $addressPrefix -AuthorizationKey $authorizationKey
+
+		#Set on Express Route Circuit
+		Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $ckt
+
+		#Get Express Route Circuit Resource
+		$ckt = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $groupName
+		$ckt
+
+		#Verify Circuit Connection fields
+		Assert-AreEqual "transit" $ckt.Peerings[0].Connections[0].Name
+		Assert-AreEqual "Succeeded" $ckt.Peerings[0].Connections[0].ProvisioningState
+		Assert-AreEqual "Connected" $ckt.Peerings[0].Connections[0].CircuitConnectionStatus
+
+		#Get Express Route Circuit Resource
+		$ckt = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $groupName
+
+		#Delete the circuit connection Resource
+		Remove-AzureRmExpressRouteCircuitConnectionConfig -Name $connectionName -ExpressRouteCircuit $ckt
+
+		#Set on Express Route Circuit
+		Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $ckt
+
+		#Get Express Route Circuit Resource
+		$ckt = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $groupName
+		$ckt
+
+		#Verify Circuit Connection does not exist
+		Assert-AreEqual 0 $ckt.Peerings[0].Connections.Count
+	}
+	finally
+	{
+		#Cleanup
+	}
+}
+