Merge pull request #3801 from jaredmoo/create_db_sample_name

New-AzureRmSqlDatabase -SampleName

Author: cormacpayne

src/ResourceManager/Sql/ChangeLog.md

@@ -18,12 +18,14 @@
         - Additional information about change #1
 -->
 ## Current Release
+ * Added -SampleName parameter to New-AzureRmSqlDatabase
 
 ## Version 2.8.0
 * Bug fixes on Azure Failover Group Cmdlets
 	- Fix for operation polling
 	- Fix GracePeriodWithDataLossHour value when setting FailoverPolicy to Manual
 	- Adding obsolete warnings to upcoming parameter changes.
+
 ## Version 2.7.0
 * Bug fix - Auditing and Threat Detection cmdlets now return a meangfull error instead of null refernce error. 
 * Updating Transparent Data Encryption (TDE) with Bring Your Own Key (BYOK) support cmdlets for updated API.

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

@@ -558,6 +558,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreateV2.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreateWithSampleName.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseGet.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -12,7 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.ScenarioTest.Mocks;
 using Microsoft.Azure.Commands.ScenarioTest.SqlTests;
+using Microsoft.Azure.Management.Sql;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
@@ -22,9 +24,17 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class DatabaseCrudTests : SqlTestsBase
     {
-        public DatabaseCrudTests(ITestOutputHelper output)
+        public DatabaseCrudTests(ITestOutputHelper output) : base(output)
         {
-            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
+        }
+
+        protected override void SetupManagementClients(Rest.ClientRuntime.Azure.TestFramework.MockContext context)
+        {
+            // Only SqlClient is needed.
+            var sqlClient = GetSqlClient(context);
+            var resourcesClient = GetResourcesClient();
+            var authorizationClient = GetAuthorizationManagementClient();
+            helper.SetupSomeOfManagementClients(sqlClient, resourcesClient, authorizationClient);
         }
 
         [Fact]
@@ -34,6 +44,13 @@ public void TestDatabaseCreate()
             RunPowerShellTest("Test-CreateDatabase");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDatabaseCreateWithSampleName()
+        {
+            RunPowerShellTest("Test-CreateDatabaseWithSampleName");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDatabaseUpdate()

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

@@ -107,6 +107,39 @@ function Test-CreateDatabaseInternal ($serverVersion, $location = "Japan East")
 	}
 }
 
+<#
+	.SYNOPSIS
+	Tests creating a database with sample name.
+#>
+function Test-CreateDatabaseWithSampleName
+{
+	# Setup
+	$rg = Create-ResourceGroupForTest
+	try
+	{
+		$server = Create-ServerForTest $rg
+
+		# Create with samplename
+		$databaseName = Get-DatabaseName
+		$db = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
+			-DatabaseName $databaseName -SampleName "AdventureWorksLT" -RequestedServiceObjectiveName Basic `
+			-Tags @{"tag_key"="tag_value"}
+		Assert-AreEqual $db.DatabaseName $databaseName
+		Assert-AreEqual $db.CurrentServiceObjectiveName Basic
+		Assert-NotNull $db.MaxSizeBytes
+		Assert-NotNull $db.Edition
+		Assert-NotNull $db.CurrentServiceObjectiveName
+		Assert-NotNull $db.CollationName
+		Assert-NotNull $db.Tags
+		Assert-AreEqual True $db.Tags.ContainsKey("tag_key")
+		Assert-AreEqual "tag_value" $db.Tags["tag_key"]
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+	}
+}
+
 <#
 	.SYNOPSIS
 	Tests updating a database

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

@@ -26,6 +26,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Xunit.Abstractions;
 using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 
 namespace Microsoft.Azure.Commands.ScenarioTest.SqlTests
@@ -46,6 +48,15 @@ protected SqlTestsBase()
             helper = new SqlEvnSetupHelper();
         }
 
+        protected SqlTestsBase(ITestOutputHelper output)
+        {
+            helper = new SqlEvnSetupHelper();
+
+            XunitTracingInterceptor tracer = new XunitTracingInterceptor(output);
+            XunitTracingInterceptor.AddToContext(tracer);
+            helper.TracingInterceptor = tracer;
+        }
+
         protected virtual void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);