Merge pull request #2010 from dihan0604/dev

[Release 1.3.0] Co-existence API

Author: markcowl

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

@@ -225,6 +225,9 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitAuthorizationCRUD.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitStageCRUD.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitCRUD.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -19,6 +19,13 @@ namespace Commands.Network.Test.ScenarioTests
 {
     public class ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestExpressRouteCircuitStageCRUD()
+        {
+            NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitStageCRUD");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestExpressRouteCircuitCRUD()

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

@@ -12,6 +12,49 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+<#
+.SYNOPSIS
+Tests ExpressRouteCircuitCRUD.
+#>
+function Test-ExpressRouteCircuitStageCRUD
+{
+    # Setup
+    $rgname = 'movecircuit'
+    $circuitName = Get-ResourceName
+    $rglocation = "westus"
+    $resourceTypeParent = "Microsoft.Network/expressRouteCircuits"
+    $location = "westus"
+    try 
+    {
+      # Create the resource group
+      $resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+      
+      # Create the ExpressRouteCircuit
+	  $circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix test" -PeeringLocation "Silicon Valley Test" -BandwidthInMbps 50 -AllowClassicOperations $true;
+      
+      $circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
+      # set
+      $circuit.AllowClassicOperations = $false
+      $circuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $circuit
+	  
+	  #move
+	  Move-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname -Location $location -ServiceKey $circuit.ServiceKey -Force
+            
+      # Delete Circuit
+      $delete = Remove-AzureRmExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force
+      Assert-AreEqual true $delete
+		      
+      $list = Get-AzureRmExpressRouteCircuit -ResourceGroupName $rgname
+      Assert-AreEqual 0 @($list).Count
+      
+    }
+    finally
+    {
+    # Cleanup
+      Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests ExpressRouteCircuitCRUD.
@@ -75,6 +118,7 @@ function Test-ExpressRouteCircuitCRUD
       Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
       Assert-AreEqual "Silicon Valley" $getCircuit.ServiceProviderProperties.PeeringLocation
       Assert-AreEqual "1000" $getCircuit.ServiceProviderProperties.BandwidthInMbps
+      
 
       # Delete Circuit
       $delete = Remove-AzureRmExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force