Merge pull request Azure#146 from jamestao/build

Add test for Get-Metric on a ElasticPool

Author: markcowl

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

@@ -319,6 +319,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolGet.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolMetricGet.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolRemove.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs

@@ -41,6 +41,13 @@ public void TestElasticPoolGet()
             RunPowerShellTest("Test-GetElasticPool");
         }
 
+        [Fact]
+        [Trait(Category.Sql, Category.CheckIn)]
+        public void TestElasticPoolMetricGet()
+        {
+            RunPowerShellTest("Test-GetElasticPoolMetric");
+        }
+
         [Fact]
         [Trait(Category.Sql, Category.CheckIn)]
         public void TestElasticPoolRemove()

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ElasticPoolCrudTests.ps1

@@ -151,6 +151,31 @@ function Test-GetElasticPool
     }
 }
 
+<# 
+    .SYNOPSIS
+    Tests getting an elastic pool metric
+#>
+function Test-GetElasticPoolMetric
+{
+    # This test requires that an elastic pool has been created and has metrics ready
+    # To prevent requiring putting something like a Sleep(10 minutes) in the code
+    # this test requires the server/elastic pool be pre-created with metrics data available.
+    
+    # Setup and retrieve the existing pool
+    $rgName = "test-group"
+    $serverName = "groupserver1"
+    $elasticPoolName = "testpool2"
+
+    $ep1 = Get-AzureSqlElasticPool  -ServerName $serverName -ResourceGroupName $rgName `
+        -ElasticPoolName $elasticPoolName
+    Assert-NotNull $ep1
+    
+    # Get pool metrics with all values
+    $metrics = $ep1 | Get-Metrics -TimeGrain "0:5:0" -StartTime "2015-04-22T16:00:00Z" -EndTime "2015-04-22T17:00:00Z"
+    Assert-NotNull $metrics
+    Assert-True { $metrics.Count -gt 0 }
+}
+
 
 <# 
     .SYNOPSIS

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests/TestElasticPoolMetricGet.json

@@ -96,11 +96,17 @@ public override void ExecuteCmdlet()
 
             if(responseModel != null)
             {
-                if (WriteResult()) this.WriteObject(responseModel);
+                if (WriteResult())
+                {
+                    this.WriteObject(responseModel, true);
+                }
             }
             else
             {
-                if (WriteResult()) this.WriteObject(updatedModel);
+                if (WriteResult())
+                {
+                    this.WriteObject(updatedModel);
+                }
             }
         }
     }

src/ResourceManager/Sql/Commands.Sql/Common/AzureSqlCmdletBase.cs

@@ -23,6 +23,11 @@ namespace Microsoft.Azure.Commands.Sql.ElasticPool.Model
     /// </summary>
     public class AzureSqlElasticPoolModel
     {
+        /// <summary>
+        /// Gets or sets the resource id for this resource
+        /// </summary>
+        public string ResourceId { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the resource group
         /// </summary>

src/ResourceManager/Sql/Commands.Sql/Elastic Pools/Model/AzureSqlElasticPoolModel.cs

@@ -268,6 +268,7 @@ private AzureSqlElasticPoolModel CreateElasticPoolModelFromResponse(string resou
         {
             AzureSqlElasticPoolModel model = new AzureSqlElasticPoolModel();
 
+            model.ResourceId = pool.Id;
             model.ResourceGroupName = resourceGroup;
             model.ServerName = serverName;
             model.ElasticPoolName = pool.Name;

src/ResourceManager/Sql/Commands.Sql/Elastic Pools/Services/AzureSqlElasticPoolAdapter.cs

@@ -33,11 +33,11 @@ public class AzureSqlElasticPoolCommunicator
         /// The Sql client to be used by this end points communicator
         /// </summary>
         private static SqlManagementClient SqlClient { get; set; }
-        
+
         /// <summary>
         /// Gets or set the Azure subscription
         /// </summary>
-        private static AzureSubscription Subscription {get ; set; }
+        private static AzureSubscription Subscription { get; set; }
 
         /// <summary>
         /// Gets or sets the Azure profile