Merge pull request Azure#9151 from miwelsh/master

Added 2 new SKUs (Storage_Optimized_L1 and Storage_Optimized_L2) for Azure Search

Author: niander

src/Search/Search.Test/ScenarioTests/SearchServiceTests.cs

@@ -36,7 +36,21 @@ public SearchServiceTests(ITestOutputHelper output)
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewSearchService()
         {
-            TestController.NewInstance.RunPsTest(traceInterceptor,"Test-NewAzureRmSearchService");
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmSearchService");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewSearchServiceBasic()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmSearchServiceBasic");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewSearchServiceL1()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmSearchServiceL1");
         }
 
         [Fact]

src/Search/Search.Test/ScenarioTests/SearchServiceTests.ps1

@@ -50,6 +50,84 @@ function Test-NewAzureRmSearchService
     }
 }
 
+<#
+.SYNOPSIS
+Test New-AzSearchServiceBasic
+#>
+function Test-NewAzureRmSearchServiceBasic
+{
+	# Arrange
+	$rgname = getAssetName
+	$rgname = $rgname
+	$loc = Get-Location -providerNamespace "Microsoft.Search" -resourceType "searchServices" -preferredLocation "West US"
+	$svcName = $rgname + "-service"
+	$sku = "Basic"
+	$partitionCount = 1
+	$replicaCount = 1
+	$hostingMode = "Default"
+
+	try
+    {
+		New-AzResourceGroup -Name $rgname -Location $loc
+		
+		# Act
+		$newSearchService = New-AzSearchService -ResourceGroupName $rgname -Name $svcName -Sku $sku -Location $loc -PartitionCount $partitionCount -ReplicaCount $replicaCount -HostingMode $hostingMode
+		
+		# Assert
+		Assert-NotNull $newSearchService
+		Assert-AreEqual $svcName $newSearchService.Name 
+		Assert-AreEqual $sku $newSearchService.Sku
+		Assert-AreEqual $loc $newSearchService.Location
+		Assert-AreEqual $partitionCount $newSearchService.PartitionCount
+		Assert-AreEqual $replicaCount $newSearchService.ReplicaCount
+		Assert-AreEqual $hostingMode $newSearchService.HostingMode
+	}
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Test New-AzSearchServiceL1
+#>
+function Test-NewAzureRmSearchServiceL1
+{
+	# Arrange
+	$rgname = getAssetName
+	$rgname = $rgname
+	$loc = Get-Location -providerNamespace "Microsoft.Search" -resourceType "searchServices" -preferredLocation "West US"
+	$svcName = $rgname + "-service"
+	$sku = "Storage_Optimized_L1"
+	$partitionCount = 1
+	$replicaCount = 1
+	$hostingMode = "Default"
+
+	try
+    {
+		New-AzResourceGroup -Name $rgname -Location $loc
+		
+		# Act
+		$newSearchService = New-AzSearchService -ResourceGroupName $rgname -Name $svcName -Sku $sku -Location $loc -PartitionCount $partitionCount -ReplicaCount $replicaCount -HostingMode $hostingMode
+		
+		# Assert
+		Assert-NotNull $newSearchService
+		Assert-AreEqual $svcName $newSearchService.Name 
+		Assert-AreEqual $sku $newSearchService.Sku
+		Assert-AreEqual $loc $newSearchService.Location
+		Assert-AreEqual $partitionCount $newSearchService.PartitionCount
+		Assert-AreEqual $replicaCount $newSearchService.ReplicaCount
+		Assert-AreEqual $hostingMode $newSearchService.HostingMode
+	}
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Test Get-AzSearchService
@@ -85,6 +163,7 @@ function Test-GetAzureRmSearchService
 		Assert-AreEqual $newSearchService.Location $retrievedSearchService1.Location
 		Assert-AreEqual $newSearchService.Location $retrievedSearchService2.Location
 
+		Assert-AreEqual $sku $newSearchService.Sku
 		Assert-AreEqual $newSearchService.Sku $retrievedSearchService1.Sku
 		Assert-AreEqual $newSearchService.Sku $retrievedSearchService2.Sku
 

src/Search/Search.Test/Search.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Search</PsModuleName>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Search" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Search" Version="3.0.0" />
   </ItemGroup>
 
 </Project>