Regenearte Cognitive Services Mgmt. SDK with latest Spec and AutoRest (targeting release as 2.1)

src/SDKs/CognitiveServices/management/AzSdk.RP.props

@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag>CognitiveServices_2017-04-18;</AzureApiTag>
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>

src/SDKs/CognitiveServices/management/CognitiveServices.Tests/Helpers/CognitiveServicesManagementTestUtilities.cs

@@ -106,7 +106,7 @@ public static string CreateCognitiveServicesAccount(CognitiveServicesManagementC
             string accountName = TestUtilities.GenerateName("csa");
             CognitiveServicesAccountCreateParameters parameters = GetDefaultCognitiveServicesAccountParameters();
             if (!string.IsNullOrEmpty(kind)) parameters.Kind = kind;
-            var createRequest2 = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, parameters);
+            var createRequest2 = cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, parameters);
 
             return accountName;
         }
@@ -122,7 +122,7 @@ public static CognitiveServicesAccount CreateAndValidateAccountWithOnlyRequiredP
                 Location = location ?? DefaultLocation,
                 Properties = new object(),
             };
-            var account = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgName, accountName, parameters);
+            var account = cognitiveServicesMgmtClient.Accounts.Create(rgName, accountName, parameters);
             VerifyAccountProperties(account, false, accountType, skuName, location ?? DefaultLocation);
 
             return account;

src/SDKs/CognitiveServices/management/CognitiveServices.Tests/Tests/CognitiveServicesAccountTests.cs

@@ -38,11 +38,11 @@ public void CognitiveServicesAccountCreateTest()
                 var parameters = CognitiveServicesManagementTestUtilities.GetDefaultCognitiveServicesAccountParameters();
 
                 // Create cognitive services account
-                var account = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, parameters);
+                var account = cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, parameters);
                 CognitiveServicesManagementTestUtilities.VerifyAccountProperties(account, true);
 
                 // Create same account again, make sure it doesn't fail
-                account = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, parameters);
+                account = cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, parameters);
                 CognitiveServicesManagementTestUtilities.VerifyAccountProperties(account, true);
 
                 // Create account with only required params, for each sku (but free, since we can't have two free accounts in the same subscription)
@@ -99,16 +99,16 @@ public void CognitiveServicesAccountDeleteTest()
                 var rgname = CognitiveServicesManagementTestUtilities.CreateResourceGroup(resourcesClient);
 
                 // Delete an account which does not exist
-                cognitiveServicesMgmtClient.CognitiveServicesAccounts.Delete(rgname, "missingaccount");
+                cognitiveServicesMgmtClient.Accounts.Delete(rgname, "missingaccount");
 
                 // Create cognitive services account
                 string accountName = CognitiveServicesManagementTestUtilities.CreateCognitiveServicesAccount(cognitiveServicesMgmtClient, rgname);
 
                 // Delete an account
-                cognitiveServicesMgmtClient.CognitiveServicesAccounts.Delete(rgname, accountName);
+                cognitiveServicesMgmtClient.Accounts.Delete(rgname, accountName);
 
                 // Delete an account which was just deleted
-                cognitiveServicesMgmtClient.CognitiveServicesAccounts.Delete(rgname, accountName);
+                cognitiveServicesMgmtClient.Accounts.Delete(rgname, accountName);
             }
         }
 
@@ -129,12 +129,12 @@ public void CognitiveServicesAccountCreateAndGetDifferentSkusTest()
                 var f0Account = CognitiveServicesManagementTestUtilities.CreateAndValidateAccountWithOnlyRequiredParameters(cognitiveServicesMgmtClient, rgname, SkuName.F0, Kind.TextAnalytics);
                 var s1Account = CognitiveServicesManagementTestUtilities.CreateAndValidateAccountWithOnlyRequiredParameters(cognitiveServicesMgmtClient, rgname, SkuName.S1, Kind.TextAnalytics);
 
-                var f0Properties = cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties(rgname, f0Account.Name);
+                var f0Properties = cognitiveServicesMgmtClient.Accounts.GetProperties(rgname, f0Account.Name);
                 Assert.Equal(SkuName.F0, f0Properties.Sku.Name);
                 Assert.Equal(Kind.TextAnalytics.ToString(), f0Properties.Kind);
 
 
-                var s1Properties = cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties(rgname, s1Account.Name);
+                var s1Properties = cognitiveServicesMgmtClient.Accounts.GetProperties(rgname, s1Account.Name);
                 Assert.Equal(SkuName.S1, s1Properties.Sku.Name);
                 Assert.Equal(Kind.TextAnalytics.ToString(), s1Properties.Kind);
             }
@@ -218,7 +218,7 @@ public void CognitiveServicesAccountListKeysTest()
                 string accountName = CognitiveServicesManagementTestUtilities.CreateCognitiveServicesAccount(cognitiveServicesMgmtClient, rgname);
 
                 // List keys
-                var keys = cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListKeys(rgname, accountName);
+                var keys = cognitiveServicesMgmtClient.Accounts.ListKeys(rgname, accountName);
                 Assert.NotNull(keys);
 
                 // Validate Key1
@@ -245,13 +245,13 @@ public void CognitiveServicesAccountRegenerateKeyTest()
                 string accountName = CognitiveServicesManagementTestUtilities.CreateCognitiveServicesAccount(cognitiveServicesMgmtClient, rgname);
 
                 // List keys
-                var keys = cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListKeys(rgname, accountName);
+                var keys = cognitiveServicesMgmtClient.Accounts.ListKeys(rgname, accountName);
                 Assert.NotNull(keys);
                 var key2 = keys.Key2;
                 Assert.NotNull(key2);
 
                 // Regenerate keys and verify that keys change
-                var regenKeys = cognitiveServicesMgmtClient.CognitiveServicesAccounts.RegenerateKey(rgname, accountName, KeyName.Key2);
+                var regenKeys = cognitiveServicesMgmtClient.Accounts.RegenerateKey(rgname, accountName, KeyName.Key2);
                 var key2Regen = regenKeys.Key2;
                 Assert.NotNull(key2Regen);
 
@@ -278,11 +278,11 @@ public void CognitiveServicesAccountUpdateWithCreateTest()
                 var accountName = createdAccount.Name;
 
                 // Update SKU 
-                var account = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Update(rgname, accountName, new Sku { Name = SkuName.S1 });
+                var account = cognitiveServicesMgmtClient.Accounts.Update(rgname, accountName, new Sku { Name = SkuName.S1 });
                 Assert.Equal(SkuName.S1, account.Sku.Name);
 
                 // Validate
-                var fetchedAccount = cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties(rgname, accountName);
+                var fetchedAccount = cognitiveServicesMgmtClient.Accounts.GetProperties(rgname, accountName);
                 Assert.Equal(SkuName.S1, fetchedAccount.Sku.Name);
 
                 var newTags = new Dictionary<string, string>
@@ -293,10 +293,10 @@ public void CognitiveServicesAccountUpdateWithCreateTest()
                 };
 
                 // Update account tags
-                account = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Update(rgname, accountName, null, newTags);
+                account = cognitiveServicesMgmtClient.Accounts.Update(rgname, accountName, null, newTags);
                 Assert.Equal(newTags.Count, account.Tags.Count);
                 // Validate
-                fetchedAccount = cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties(rgname, accountName);
+                fetchedAccount = cognitiveServicesMgmtClient.Accounts.GetProperties(rgname, accountName);
                 Assert.Equal(SkuName.S1, fetchedAccount.Sku.Name);
                 Assert.Equal(newTags.Count, fetchedAccount.Tags.Count());
                 Assert.Collection(fetchedAccount.Tags,
@@ -326,9 +326,9 @@ public void CognitiveServicesAccountEnumerateSkusTest()
 
                 // Enumerate SKUs
 
-                var skuList = cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListSkus(rgname, accountName);
+                var skuList = cognitiveServicesMgmtClient.Accounts.ListSkus(rgname, accountName);
 
-                Assert.Equal(1, skuList.Value.Select(x => x.ResourceType).Distinct().Count());
+                Assert.Single(skuList.Value.Select(x => x.ResourceType).Distinct());
 
                 Assert.Equal($"{c_resourceNamespace}/{c_resourceType}", skuList.Value.Select(x => x.ResourceType).First());
 
@@ -366,12 +366,12 @@ public void CognitiveServicesCreateAccountErrorTest()
                 };
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create("NotExistedRG", accountName, parameters),
+                    () => cognitiveServicesMgmtClient.Accounts.Create("NotExistedRG", accountName, parameters),
                     "ResourceGroupNotFound");
 
                 parameters.Location = "BLA";
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, parameters),
+                    () => cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, parameters),
                     "LocationNotAvailableForResourceType");
             }
         }
@@ -407,11 +407,11 @@ public void CognitiveServicesCreateAccountErrorTest2()
                 };
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, nonExistApiPara),
+                    () => cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, nonExistApiPara),
                     "InvalidApiSetId");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, accountName, nonExistSkuPara),
+                    () => cognitiveServicesMgmtClient.Accounts.Create(rgname, accountName, nonExistSkuPara),
                     "InvalidSkuId");
             }
         }
@@ -430,11 +430,11 @@ public void CognitiveServicesGetAccountErrorTest()
                 var rgname = CognitiveServicesManagementTestUtilities.CreateResourceGroup(resourcesClient);
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties("NotExistedRG", "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.GetProperties("NotExistedRG", "nonExistedAccountName"),
                     "ResourceGroupNotFound");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.GetProperties(rgname, "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.GetProperties(rgname, "nonExistedAccountName"),
                     "ResourceNotFound");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
@@ -462,16 +462,16 @@ public void CognitiveServicesUpdateAccountErrorTest()
 
                 // try to update non-existent account
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Update("NotExistedRG", "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.Update("NotExistedRG", "nonExistedAccountName"),
                     "ResourceGroupNotFound");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Update(rgname, "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.Update(rgname, "nonExistedAccountName"),
                     "ResourceNotFound");
 
                 // Update with a SKU which doesn't exist
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Update(rgname, accountName, new Sku(SkuName.S0)),
+                    () => cognitiveServicesMgmtClient.Accounts.Update(rgname, accountName, new Sku(SkuName.S0)),
                     "InvalidSkuId");
             }
         }
@@ -491,7 +491,7 @@ public void CognitiveServicesDeleteAccountErrorTest()
 
                 // try to delete non-existent account
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.Delete("NotExistedRG", "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.Delete("NotExistedRG", "nonExistedAccountName"),
                     "ResourceGroupNotFound");
             }
         }
@@ -510,11 +510,11 @@ public void CognitiveServicesAccountKeysErrorTest()
                 var rgname = CognitiveServicesManagementTestUtilities.CreateResourceGroup(resourcesClient);
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListKeys("NotExistedRG", "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.ListKeys("NotExistedRG", "nonExistedAccountName"),
                     "ResourceGroupNotFound");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListKeys(rgname, "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.ListKeys(rgname, "nonExistedAccountName"),
                     "ResourceNotFound");
             }
         }
@@ -533,11 +533,11 @@ public void CognitiveServicesEnumerateSkusErrorTest()
                 var rgname = CognitiveServicesManagementTestUtilities.CreateResourceGroup(resourcesClient);
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListSkus("NotExistedRG", "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.ListSkus("NotExistedRG", "nonExistedAccountName"),
                     "ResourceGroupNotFound");
 
                 CognitiveServicesManagementTestUtilities.ValidateExpectedException(
-                    () => cognitiveServicesMgmtClient.CognitiveServicesAccounts.ListSkus(rgname, "nonExistedAccountName"),
+                    () => cognitiveServicesMgmtClient.Accounts.ListSkus(rgname, "nonExistedAccountName"),
                     "ResourceNotFound");
             }
         }
@@ -588,8 +588,8 @@ public void CognitiveServicesAccountMinMaxNameLengthTest()
                 var minName = "zz";
                 var maxName = "AcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcadAcad";
 
-                var minAccount = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, minName, parameters);
-                var maxAccount = cognitiveServicesMgmtClient.CognitiveServicesAccounts.Create(rgname, maxName, parameters);
+                var minAccount = cognitiveServicesMgmtClient.Accounts.Create(rgname, minName, parameters);
+                var maxAccount = cognitiveServicesMgmtClient.Accounts.Create(rgname, maxName, parameters);
 
                 Assert.Equal(minName, minAccount.Name);
                 Assert.Equal(maxName, maxAccount.Name);