Skip to content

[Cognitive Services] March release (Add GetUsages operation, addnew/remove some API Kind) #4128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsgouda merged 4 commits into from
Mar 15, 2018
Merged

[Cognitive Services] March release (Add GetUsages operation, addnew/remove some API Kind) #4128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23e7867
initial commit - need to fix usage test case
felixwa Mar 9, 2018
7cb7f7c
Regenerate to correct limit/currentValue types
felixwa Mar 13, 2018
5a4f59a
Bump version to 4.0.0.0
felixwa Mar 13, 2018
b4fa48f
Update RecordSession for CognitiveServicesAccountUpdateWithCreateTest
felixwa Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...es/management/CognitiveServices.Tests/Helpers/CognitiveServicesManagementTestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public static string CreateCognitiveServicesAccount(CognitiveServicesManagementC
return accountName;
}

public static CognitiveServicesAccount CreateAndValidateAccountWithOnlyRequiredParameters(CognitiveServicesManagementClient cognitiveServicesMgmtClient, string rgName, string skuName, string accountType = Kind.Recommendations, string location = null)
public static CognitiveServicesAccount CreateAndValidateAccountWithOnlyRequiredParameters(CognitiveServicesManagementClient cognitiveServicesMgmtClient, string rgName, string skuName, string accountType = Kind.TextAnalytics, string location = null)
{
// Create account with only required params
var accountName = TestUtilities.GenerateName("csa");
Expand Down
637 changes: 344 additions & 293 deletions ...rvices.Tests.CognitiveServicesAccountTests/CognitiveServicesAccountCreateAllApisTest.json
View file
Open in desktop

Large diffs are not rendered by default.

245 changes: 133 additions & 112 deletions ...itiveServices.Tests.CognitiveServicesAccountTests/CognitiveServicesAccountCreateTest.json
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 50 additions & 41 deletions ...rvices.Tests.CognitiveServicesAccountTests/CognitiveServicesAccountEnumerateSkusTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourcegroups/res5422?api-version=2017-05-10",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlZ3JvdXBzL3JlczU0MjI/YXBpLXZlcnNpb249MjAxNy0wNS0xMA==",
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourcegroups/res5804?api-version=2017-05-10",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlZ3JvdXBzL3JlczU4MDQ/YXBpLXZlcnNpb249MjAxNy0wNS0xMA==",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"location\": \"westus\"\r\n}",
"RequestHeaders": {
Expand All @@ -13,7 +13,7 @@
"28"
],
"x-ms-client-request-id": [
"067cb232-0fd8-4fb4-942a-e3163cfa1744"
"873b075c-0a6c-43b9-aaa1-6022b203f61a"
],
"accept-language": [
"en-US"
Expand All @@ -23,7 +23,7 @@
"Microsoft.Azure.Management.ResourceManager.ResourceManagementClient/1.6.0.0"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5422\",\r\n \"name\": \"res5422\",\r\n \"location\": \"westus\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5804\",\r\n \"name\": \"res5804\",\r\n \"location\": \"westus\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
"167"
Expand All @@ -38,56 +38,59 @@
"no-cache"
],
"Date": [
"Fri, 26 May 2017 11:19:14 GMT"
"Fri, 09 Mar 2018 07:47:51 GMT"
],
"Pragma": [
"no-cache"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1194"
"1199"
],
"x-ms-request-id": [
"6fd42fb6-3594-4c65-ae0f-fed5b4b18ed1"
"5d6f1161-ecdd-4655-8e4f-d171057b2628"
],
"x-ms-correlation-request-id": [
"6fd42fb6-3594-4c65-ae0f-fed5b4b18ed1"
"5d6f1161-ecdd-4655-8e4f-d171057b2628"
],
"x-ms-routing-request-id": [
"SOUTHEASTASIA:20170526T111914Z:6fd42fb6-3594-4c65-ae0f-fed5b4b18ed1"
"JAPANWEST:20180309T074752Z:5d6f1161-ecdd-4655-8e4f-d171057b2628"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 201
},
{
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5422/providers/Microsoft.CognitiveServices/accounts/csa679?api-version=2017-04-18",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlR3JvdXBzL3JlczU0MjIvcHJvdmlkZXJzL01pY3Jvc29mdC5Db2duaXRpdmVTZXJ2aWNlcy9hY2NvdW50cy9jc2E2Nzk/YXBpLXZlcnNpb249MjAxNy0wNC0xOA==",
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5804/providers/Microsoft.CognitiveServices/accounts/csa910?api-version=2017-04-18",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlR3JvdXBzL3JlczU4MDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Db2duaXRpdmVTZXJ2aWNlcy9hY2NvdW50cy9jc2E5MTA/YXBpLXZlcnNpb249MjAxNy0wNC0xOA==",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"sku\": {\r\n \"name\": \"S3\"\r\n },\r\n \"kind\": \"Recommendations\",\r\n \"location\": \"westus\",\r\n \"properties\": {}\r\n}",
"RequestBody": "{\r\n \"sku\": {\r\n \"name\": \"S3\"\r\n },\r\n \"kind\": \"TextAnalytics\",\r\n \"location\": \"westus\",\r\n \"properties\": {}\r\n}",
"RequestHeaders": {
"Content-Type": [
"application/json; charset=utf-8"
],
"Content-Length": [
"115"
"113"
],
"x-ms-client-request-id": [
"06086dd5-e167-407e-aee3-6b9624254d85"
"2a8b5f6b-f3fa-44ba-b54c-c32d665fd7e1"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25211.01",
"Microsoft.Azure.Management.CognitiveServices.CognitiveServicesManagementClient/1.0.0.0"
"Microsoft.Azure.Management.CognitiveServices.CognitiveServicesManagementClient/3.0.0.0"
]
},
"ResponseBody": "{\r\n \"id\": \"/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5422/providers/Microsoft.CognitiveServices/accounts/csa679\",\r\n \"name\": \"csa679\",\r\n \"type\": \"Microsoft.CognitiveServices/accounts\",\r\n \"location\": \"westus\",\r\n \"sku\": {\r\n \"name\": \"S3\"\r\n },\r\n \"kind\": \"Recommendations\",\r\n \"etag\": \"W/\\\"datetime'2017-05-26T11%3A19%3A17.1018045Z'\\\"\",\r\n \"properties\": {\r\n \"endpoint\": \"https://westus.api.cognitive.microsoft.com/recommendations/v4.0\",\r\n \"skuChangeInfo\": null,\r\n \"provisioningState\": \"Succeeded\",\r\n \"internalId\": \"8bd6ef4058844f228afd36f814191a4a\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"id\": \"/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5804/providers/Microsoft.CognitiveServices/accounts/csa910\",\r\n \"name\": \"csa910\",\r\n \"type\": \"Microsoft.CognitiveServices/accounts\",\r\n \"etag\": \"\\\"0a00b5f5-0000-0000-0000-5aa23c2b0000\\\"\",\r\n \"location\": \"westus\",\r\n \"sku\": {\r\n \"name\": \"S3\"\r\n },\r\n \"kind\": \"TextAnalytics\",\r\n \"properties\": {\r\n \"endpoint\": \"https://westus.api.cognitive.microsoft.com/text/analytics/v2.0\",\r\n \"internalId\": \"16f31a1dba4e46569e4f3bbbe83795ef\",\r\n \"dateCreated\": \"2018-03-09T07:47:54.9603949Z\",\r\n \"apiProperties\": null,\r\n \"isMigrated\": false,\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
"515"
"568"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -99,16 +102,19 @@
"no-cache"
],
"Date": [
"Fri, 26 May 2017 11:19:18 GMT"
"Fri, 09 Mar 2018 07:47:55 GMT"
],
"Pragma": [
"no-cache"
],
"ETag": [
"W/\"datetime'2017-05-26T11%3A19%3A17.1018045Z'\""
"\"0a00b5f5-0000-0000-0000-5aa23c2b0000\""
],
"Server": [
"Microsoft-IIS/8.5"
"Microsoft-IIS/10.0"
],
"x-ms-request-id": [
"bae8cc43-7ad6-44bf-8cd8-270c928a267f"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
Expand All @@ -120,38 +126,38 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1193"
],
"x-ms-request-id": [
"4f7bbb93-d4b2-4ef6-9b77-8840b52ccf23"
"1198"
],
"x-ms-correlation-request-id": [
"4f7bbb93-d4b2-4ef6-9b77-8840b52ccf23"
"c8c20295-579b-46d8-bcb9-141d120e5083"
],
"x-ms-routing-request-id": [
"SOUTHEASTASIA:20170526T111918Z:4f7bbb93-d4b2-4ef6-9b77-8840b52ccf23"
"JAPANWEST:20180309T074755Z:c8c20295-579b-46d8-bcb9-141d120e5083"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 201
},
{
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5422/providers/Microsoft.CognitiveServices/accounts/csa679/skus?api-version=2017-04-18",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlR3JvdXBzL3JlczU0MjIvcHJvdmlkZXJzL01pY3Jvc29mdC5Db2duaXRpdmVTZXJ2aWNlcy9hY2NvdW50cy9jc2E2Nzkvc2t1cz9hcGktdmVyc2lvbj0yMDE3LTA0LTE4",
"RequestUri": "/subscriptions/f9b96b36-1f5e-4021-8959-51527e26e6d3/resourceGroups/res5804/providers/Microsoft.CognitiveServices/accounts/csa910/skus?api-version=2017-04-18",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjliOTZiMzYtMWY1ZS00MDIxLTg5NTktNTE1MjdlMjZlNmQzL3Jlc291cmNlR3JvdXBzL3JlczU4MDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Db2duaXRpdmVTZXJ2aWNlcy9hY2NvdW50cy9jc2E5MTAvc2t1cz9hcGktdmVyc2lvbj0yMDE3LTA0LTE4",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"d00f6300-f568-4461-ab96-c5e3b629f3b7"
"9cde07a2-ffbc-468c-beb4-04e4a62bde92"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25211.01",
"Microsoft.Azure.Management.CognitiveServices.CognitiveServicesManagementClient/1.0.0.0"
"Microsoft.Azure.Management.CognitiveServices.CognitiveServicesManagementClient/3.0.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"F0\",\r\n \"tier\": \"Free\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S1\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S2\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S3\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S4\",\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n}",
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"F0\",\r\n \"tier\": \"Free\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S1\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S2\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S3\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\n \"resourceType\": \"Microsoft.CognitiveServices/accounts\",\r\n \"sku\": {\r\n \"name\": \"S4\",\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n}",
"ResponseHeaders": {
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -163,7 +169,7 @@
"no-cache"
],
"Date": [
"Fri, 26 May 2017 11:19:18 GMT"
"Fri, 09 Mar 2018 07:47:56 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -172,11 +178,14 @@
"chunked"
],
"Server": [
"Microsoft-IIS/8.5"
"Microsoft-IIS/10.0"
],
"Vary": [
"Accept-Encoding"
],
"x-ms-request-id": [
"0716a249-96bd-485c-88cc-37b655437875"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
Expand All @@ -187,27 +196,27 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14977"
],
"x-ms-request-id": [
"1b9fd1c2-66f2-4ce9-8dba-02bfa3bbf022"
"14916"
],
"x-ms-correlation-request-id": [
"1b9fd1c2-66f2-4ce9-8dba-02bfa3bbf022"
"bd1cee3a-49c7-432e-a789-eb2400385d87"
],
"x-ms-routing-request-id": [
"SOUTHEASTASIA:20170526T111918Z:1b9fd1c2-66f2-4ce9-8dba-02bfa3bbf022"
"JAPANWEST:20180309T074757Z:bd1cee3a-49c7-432e-a789-eb2400385d87"
],
"X-Content-Type-Options": [
"nosniff"
]
},
"StatusCode": 200
}
],
"Names": {
"CreateResourceGroup": [
"res5422"
"res5804"
],
"CreateAndValidateAccountWithOnlyRequiredParameters": [
"csa679"
"csa910"
]
},
"Variables": {
Expand Down
Loading