Merge pull request #319 from felixwa/felixwa/Fixes-Paging

[Cognitive Services] Fixes paging issue

Author: cormacpayne

src/ResourceManager/CognitiveServices/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Integrate with Cognitive Services Management SDK version 2.0.0.
+* Get-AzureRmCognitiveServicesAccount now can correctly support paging.
 
 ## Version 0.8.4
 

src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.csproj

@@ -49,10 +49,10 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Authorization">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.1.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.2.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -175,6 +175,9 @@
     <None Include="SessionRecords\CognitiveServices.Test.ScenarioTests.CognitiveServicesAccountTests\TestGetAccounts.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\CognitiveServices.Test.ScenarioTests.CognitiveServicesAccountTests\TestGetWithPaging.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\CognitiveServices.Test.ScenarioTests.CognitiveServicesAccountTests\TestMinMaxAccountNames.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

@@ -118,5 +118,12 @@ public void TestMinMaxAccountNames()
         {
             TestController.NewInstance.RunPsTest("Test-MinMaxAccountName");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetWithPaging()
+        {
+            TestController.NewInstance.RunPsTest("Test-GetWithPaging");
+        }
     }
 }

src/ResourceManager/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.ps1

@@ -462,3 +462,43 @@ function Test-MinMaxAccountName
     }
 }
 
+<#
+.SYNOPSIS
+Test  Test-GetWithPaging
+#>
+function Test-GetWithPaging
+{
+	# Setup
+    $rgname = Get-CognitiveServicesManagementTestResourceName
+	$loc = 'West US'
+	
+	try
+    {
+		$TotalCount = 100
+        # Test
+        New-AzureRmResourceGroup -Name $rgname -Location $loc
+
+		# 100 Face
+		For($i = 0; $i -lt $TotalCount ; $i++)
+		{
+			New-AzureRmCognitiveServicesAccount -ResourceGroupName $rgname -Name "facepaging_wu_$i" -Type 'Face' -SkuName 'S0' -Location $loc -Force;
+		}
+
+		# 100 Emotion
+		For($i = 0; $i -lt $TotalCount ; $i++)
+		{
+			New-AzureRmCognitiveServicesAccount -ResourceGroupName $rgname -Name "emotionpaging_wu_$i" -Type 'Emotion' -SkuName 'S0' -Location $loc -Force;
+		}
+
+		$accounts = Get-AzureRmCognitiveServicesAccount
+		Assert-AreEqual 200 $accounts.Count
+
+		$accounts = Get-AzureRmCognitiveServicesAccount -ResourceGroupName $rgname
+		Assert-AreEqual 200 $accounts.Count
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}