Merge pull request #5484 from markcowl/fixcap

Availability Set Name and Progress fix

Author: cormacpayne

src/Common/Commands.Common/AzureLongRunningJob.cs

@@ -80,6 +80,7 @@ protected AzureLongRunningJob(string command, string name) : base(command, name)
     /// <typeparam name="T">The type of the cmdlet being executed</typeparam>
     public class AzureLongRunningJob<T> : AzureLongRunningJob, ICommandRuntime where T : AzurePSCmdlet
     {
+        const int MaxRecords = 1000;
         string _status = "Running";
         T _cmdlet;
         ICommandRuntime _runtime;
@@ -671,7 +672,7 @@ public bool TransactionAvailable()
         public void WriteCommandDetail(string text)
         {
             ThrowIfJobFailedOrCancelled();
-            if (Verbose.IsOpen)
+            if (Verbose.IsOpen && Verbose.Count < MaxRecords)
             {
                 Verbose.Add(new VerboseRecord(text));
             }
@@ -684,7 +685,7 @@ public void WriteCommandDetail(string text)
         public void WriteDebug(string text)
         {
             ThrowIfJobFailedOrCancelled();
-            if (Debug.IsOpen)
+            if (Debug.IsOpen && Debug.Count < MaxRecords)
             {
                 Debug.Add(new DebugRecord(text));
             }
@@ -745,7 +746,7 @@ public void WriteObject(object sendToPipeline, bool enumerateCollection)
         public void WriteProgress(ProgressRecord progressRecord)
         {
             ThrowIfJobFailedOrCancelled();
-            if (Progress.IsOpen)
+            if (Progress.IsOpen && Progress.Count < MaxRecords)
             {
                 Progress.Add(progressRecord);
             }
@@ -769,7 +770,7 @@ public void WriteProgress(long sourceId, ProgressRecord progressRecord)
         public void WriteVerbose(string text)
         {
             ThrowIfJobFailedOrCancelled();
-            if (Verbose.IsOpen)
+            if (Verbose.IsOpen && Verbose.Count < MaxRecords)
             {
                 Verbose.Add(new VerboseRecord(text));
             }

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

@@ -31,5 +31,12 @@ public void TestSimpleNewVm()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVm");
         }
+
+        [Fact] 
+        [Trait(Category.AcceptanceType, Category.CheckIn)] 
+        public void TestSimpleNewVmWithAvailabilitySet2()
+        { 
+            ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVmWithAvailabilitySet2"); 
+        }
     }
 }

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

@@ -39,3 +39,53 @@ function Test-SimpleNewVm
         Clean-ResourceGroup $vmname
     }
 }
+
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vm
+#>
+function Test-SimpleNewVmWithAvailabilitySet2
+{
+    # Setup
+    $rgname = Get-ResourceName
+
+    try
+    {
+		$username = "admin01"
+		$password = "werWER345#%^" | ConvertTo-SecureString -AsPlainText -Force
+		$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+		[string]$vmname = "myVM"
+		[string]$asname = "myAvailabilitySet"
+
+        # Common
+		$r = New-AzureRmResourceGroup -Name $rgname -Location "eastus"
+		$a = New-AzureRmAvailabilitySet `
+			-ResourceGroupName $rgname `
+			-Name $asname `
+			-Location "eastus" `
+			-Sku "Aligned" `
+			-PlatformUpdateDomainCount 2 `
+			-PlatformFaultDomainCount 2
+
+		$x = New-AzureRmVM `
+			-ResourceGroupName $rgname `
+			-Name $vmname `
+			-Credential $cred `
+		    -VirtualNetworkName "myVnet" `
+			-SubnetName "mySubnet" `
+		    -OpenPorts 80,3389 `
+			-PublicIpAddressName "myPublicIpAddress" `
+			-SecurityGroupName "myNetworkSecurityGroup" `
+			-AvailabilitySetName $asname `
+			-DomainNameLabel "myvm-ad9300"
+
+		Assert-AreEqual $vmname $x.Name;		
+		Assert-AreEqual $a.Id $x.AvailabilitySetReference.Id
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}