`

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

@@ -65,7 +65,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Sql">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.25.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.26.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -329,15 +329,27 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreateV2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseGet.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseGetV2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseRemove.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseRemoveV2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdateV2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolCreate.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -144,15 +144,14 @@ function Remove-ResourceGroupForTest ($rg)
 	.SYNOPSIS
 	Creates the test environment needed to perform the Sql server CRUD tests
 #>
-function Create-ServerForTest ($resourceGroup, $location = "Japan East")
+function Create-ServerForTest ($resourceGroup, $serverVersion = "12.0", $location = "Japan East")
 {
 	$serverName = Get-ServerName
-	$version = "12.0"
 	$serverLogin = "testusername"
 	$serverPassword = "t357ingP@s5w0rd!"
 	$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force)) 
 
-	$server = New-AzureSqlServer -ResourceGroupName  $resourceGroup.ResourceGroupName -ServerName $serverName -Location $location -ServerVersion $version -SqlAdminCredentials $credentials
+	$server = New-AzureSqlServer -ResourceGroupName  $resourceGroup.ResourceGroupName -ServerName $serverName -Location $location -ServerVersion $serverVersion -SqlAdminCredentials $credentials
 	return $server
 }
 

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

@@ -47,5 +47,33 @@ public void TestDatabaseRemove()
         {
             RunPowerShellTest("Test-RemoveDatabase");
         }
+
+        [Fact]
+        [Trait(Category.Sql, Category.CheckIn)]
+        public void TestDatabaseCreateV2()
+        {
+            RunPowerShellTest("Test-CreateDatabaseV2");
+        }
+
+        [Fact]
+        [Trait(Category.Sql, Category.CheckIn)]
+        public void TestDatabaseUpdateV2()
+        {
+            RunPowerShellTest("Test-UpdateDatabaseV2");
+        }
+
+        [Fact]
+        [Trait(Category.Sql, Category.CheckIn)]
+        public void TestDatabaseGetV2()
+        {
+            RunPowerShellTest("Test-GetDatabaseV2");
+        }
+
+        [Fact]
+        [Trait(Category.Sql, Category.CheckIn)]
+        public void TestDatabaseRemoveV2()
+        {
+            RunPowerShellTest("Test-RemoveDatabaseV2");
+        }
     }
 }

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

@@ -17,31 +17,52 @@
 	Tests creating a database
 #>
 function Test-CreateDatabase
+{
+	Test-CreateDatabaseInternal "12.0"
+}
+
+<#
+	.SYNOPSIS
+	Tests creating a database
+#>
+function Test-CreateDatabaseV2
+{
+	Test-CreateDatabaseInternal "2.0" "North Central US"
+}
+
+<#
+	.SYNOPSIS
+	Tests creating a database
+#>
+function Test-CreateDatabaseInternal ($serverVersion, $location = "Japan East")
 {
 	# Setup
 	$rg = Create-ResourceGroupForTest
-	$server = Create-ServerForTest $rg
+	$server = Create-ServerForTest $rg $serverVersion $location
 
 	try
 	{
-		# Create with default values
-		$databaseName = Get-DatabaseName
-		$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
-		Assert-AreEqual $db.DatabaseName $databaseName
-		Assert-NotNull $db.MaxSizeBytes
-		Assert-NotNull $db.Edition
-		Assert-NotNull $db.CurrentServiceLevelObjectiveName
-		Assert-NotNull $db.CollationName
-
-		# Create with default values via piping
-		$databaseName = Get-DatabaseName
-		$db = $server | New-AzureSqlDatabase -DatabaseName $databaseName
-		Assert-AreEqual $db.DatabaseName $databaseName
-		Assert-NotNull $db.MaxSizeBytes
-		Assert-NotNull $db.Edition
-		Assert-NotNull $db.CurrentServiceLevelObjectiveName
-		Assert-NotNull $db.CollationName
+		if ($serverVersion -ne "2.0")
+		{
+			# Create with default values
+			$databaseName = Get-DatabaseName
+			$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
+			Assert-AreEqual $db.DatabaseName $databaseName
+			Assert-NotNull $db.MaxSizeBytes
+			Assert-NotNull $db.Edition
+			Assert-NotNull $db.CurrentServiceLevelObjectiveName
+			Assert-NotNull $db.CollationName
 
+			# Create with default values via piping
+			$databaseName = Get-DatabaseName
+			$db = $server | New-AzureSqlDatabase -DatabaseName $databaseName
+			Assert-AreEqual $db.DatabaseName $databaseName
+			Assert-NotNull $db.MaxSizeBytes
+			Assert-NotNull $db.Edition
+			Assert-NotNull $db.CurrentServiceLevelObjectiveName
+			Assert-NotNull $db.CollationName
+		}
+
 		# Create with all parameters
 		$databaseName = Get-DatabaseName
 		$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
@@ -68,23 +89,40 @@ function Test-CreateDatabase
 	}
 }
 
-
 <#
 	.SYNOPSIS
 	Tests updating a database
 #>
 function Test-UpdateDatabase
+{
+	Test-UpdateDatabaseInternal "12.0"
+}
+
+<#
+	.SYNOPSIS
+	Tests updating a database
+#>
+function Test-UpdateDatabaseV2
+{
+	Test-UpdateDatabaseInternal "2.0" "North Central US"
+}
+
+<#
+	.SYNOPSIS
+	Tests updating a database
+#>
+function Test-UpdateDatabaseInternal ($serverVersion, $location = "Japan East")
 {
 	# Setup
 	$rg = Create-ResourceGroupForTest
-	$server = Create-ServerForTest $rg
+	$server = Create-ServerForTest $rg $serverVersion $location
 
-	# Create with default values
 	$databaseName = Get-DatabaseName
-	$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
+	$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
+		-Edition Standard -MaxSizeBytes 250GB -RequestedServiceObjectiveName S0
 	Assert-AreEqual $db.DatabaseName $databaseName
 
-    #Default database will be Standard s0 with maxsize: 268435456000 (250GB)
+    # Database will be Standard s0 with maxsize: 268435456000 (250GB)
 
 	try
 	{
@@ -117,14 +155,32 @@ function Test-UpdateDatabase
 	Tests Getting a database
 #>
 function Test-GetDatabase
+{
+	Test-GetDatabaseInternal "12.0"
+}
+
+<#
+	.SYNOPSIS
+	Tests Getting a database
+#>
+function Test-GetDatabaseV2
+{
+	Test-GetDatabaseInternal "2.0" "North Central US"
+}
+
+<#
+	.SYNOPSIS
+	Tests Getting a database
+#>
+function Test-GetDatabaseInternal  ($serverVersion, $location = "Japan East")
 {
 	# Setup
 	$rg = Create-ResourceGroupForTest
-	$server = Create-ServerForTest $rg
+	$server = Create-ServerForTest $rg $serverVersion $location
 
 	# Create with default values
 	$databaseName = Get-DatabaseName
-	$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
+	$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -MaxSizeBytes 1GB
 	Assert-AreEqual $db1.DatabaseName $databaseName
 
     # Create database with non-defaults
@@ -166,14 +222,32 @@ function Test-GetDatabase
 	Tests Deleting a database
 #>
 function Test-RemoveDatabase
+{
+	Test-RemoveDatabaseInternal "12.0"
+}
+
+<#
+	.SYNOPSIS
+	Tests Deleting a database
+#>
+function Test-RemoveDatabaseV2
+{
+	Test-RemoveDatabaseInternal "2.0" "North Central US"
+}
+
+<#
+	.SYNOPSIS
+	Tests Deleting a database
+#>
+function Test-RemoveDatabaseInternal  ($serverVersion, $location = "Japan East")
 {
 	# Setup
 	$rg = Create-ResourceGroupForTest
-	$server = Create-ServerForTest $rg
+	$server = Create-ServerForTest $rg $serverVersion $location
 
 	# Create with default values
 	$databaseName = Get-DatabaseName
-	$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
+	$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -MaxSizeBytes 1GB
 	Assert-AreEqual $db1.DatabaseName $databaseName
 
     # Create database with non-defaults

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

@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
 {
     public class RecommendedElasticPoolTests : SqlTestsBase
     {
-        [Fact]
+        [Fact(Skip="Test needs to be regenerated.  Will be done by recommendations team.")]
         [Trait(Category.Sql, Category.CheckIn)]
         public void TestRecommendedElasticPoolList()
         {