From 84d9da8a4797fc8976dae8a0a1aac0387bc29821 Mon Sep 17 00:00:00 2001 From: Rahul Singh Date: Fri, 21 Feb 2020 14:54:38 -0800 Subject: [PATCH] 1. Adding nested "properties":{ "properties": { for ARM template. 2. updating examples. --- .../2019-07-19/examples/getBatchAIUsages.json | 80 +++++---- .../examples/getComputeOneSkuUsages.json | 14 +- .../2019-07-19/examples/getComputeUsages.json | 154 ++++++++++-------- .../2019-07-19/examples/getMsSqlUsages.json | 48 +++--- .../examples/patchComputeQuotaRequest.json | 26 +-- .../putComputeOneSkuQuotaRequest.json | 28 ++-- .../preview/2019-07-19/quota.json | 65 ++++---- 7 files changed, 235 insertions(+), 180 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getBatchAIUsages.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getBatchAIUsages.json index c0347a14861b..24d476be36d0 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getBatchAIUsages.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getBatchAIUsages.json @@ -10,49 +10,59 @@ "body": { "value": [ { - "currentValue": 15, - "limit": 20, - "name": { - "localizedValue": "Clusters", - "value": "Clusters" - }, - "unit": "Count" + "properties": { + "currentValue": 15, + "limit": 20, + "name": { + "localizedValue": "Clusters", + "value": "Clusters" + }, + "unit": "Count" + } }, { - "currentValue": 49, - "limit": 600, - "name": { - "localizedValue": "Total Cluster Dedicated Regional vCPUs", - "value": "Total Cluster Dedicated Regional vCPUs" - }, - "unit": "Count" + "properties": { + "currentValue": 49, + "limit": 600, + "name": { + "localizedValue": "Total Cluster Dedicated Regional vCPUs", + "value": "Total Cluster Dedicated Regional vCPUs" + }, + "unit": "Count" + } }, { - "currentValue": 1, - "limit": 600, - "name": { - "localizedValue": "Standard D Family Cluster Dedicated vCPUs", - "value": "Standard D Family Cluster Dedicated vCPUs" - }, - "unit": "Count" + "properties": { + "currentValue": 1, + "limit": 600, + "name": { + "localizedValue": "Standard D Family Cluster Dedicated vCPUs", + "value": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + } }, { - "currentValue": 0, - "limit": 0, - "name": { - "localizedValue": "Standard ND Family Cluster Low Priority vCPUs", - "value": "Standard ND Family Cluster LowPriority vCPUs" - }, - "unit": "Count" + "properties": { + "currentValue": 0, + "limit": 0, + "name": { + "localizedValue": "Standard ND Family Cluster Low Priority vCPUs", + "value": "Standard ND Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + } }, { - "currentValue": 0, - "limit": 150, - "name": { - "localizedValue": "Standard NV Family Cluster Low Priority vCPUs", - "value": "Standard NV Family Cluster LowPriority vCPUs" - }, - "unit": "Count" + "properties": { + "currentValue": 0, + "limit": 150, + "name": { + "localizedValue": "Standard NV Family Cluster Low Priority vCPUs", + "value": "Standard NV Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + } } ] } diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeOneSkuUsages.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeOneSkuUsages.json index ac96e4112c56..f5999b070097 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeOneSkuUsages.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeOneSkuUsages.json @@ -9,12 +9,14 @@ "responses": { "200": { "body": { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardNDSFamily", - "localizedValue": "Standard NDS Family vCPUs" + "properties": { + "limit": 10, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardNDSFamily", + "localizedValue": "Standard NDS Family vCPUs" + } } } } diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeUsages.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeUsages.json index b9bd076a58a3..e973260d3e20 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeUsages.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getComputeUsages.json @@ -10,102 +10,124 @@ "body": { "value": [ { - "limit": 100, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardFSv2Family", - "localizedValue": "Standard FSv2 Family vCPUs" + "properties": { + "limit": 100, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardFSv2Family", + "localizedValue": "Standard FSv2 Family vCPUs" + } } }, { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardNDSFamily", - "localizedValue": "Standard NDS Family vCPUs" + "properties": { + "limit": 0, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardNDSFamily", + "localizedValue": "Standard NDS Family vCPUs" + } } }, { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardNCSv2Family", - "localizedValue": "Standard NCSv2 Family vCPUs" + "properties": { + "limit": 0, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardNCSv2Family", + "localizedValue": "Standard NCSv2 Family vCPUs" + } } }, { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardNCSv3Family", - "localizedValue": "Standard NCSv3 Family vCPUs" + "properties": { + "limit": 0, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardNCSv3Family", + "localizedValue": "Standard NCSv3 Family vCPUs" + } } }, { - "limit": 100, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardLSv2Family", - "localizedValue": "Standard LSv2 Family vCPUs" + "properties": { + "limit": 100, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardLSv2Family", + "localizedValue": "Standard LSv2 Family vCPUs" + } } }, { - "limit": 6, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardPBSFamily", - "localizedValue": "Standard PBS Family vCPUs" + "properties": { + "limit": 6, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardPBSFamily", + "localizedValue": "Standard PBS Family vCPUs" + } } }, { - "limit": 100, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardEIv3Family", - "localizedValue": "Standard EIv3 Family vCPUs" + "properties": { + "limit": 100, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardEIv3Family", + "localizedValue": "Standard EIv3 Family vCPUs" + } } }, { - "limit": 100, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardEISv3Family", - "localizedValue": "Standard EISv3 Family vCPUs" + "properties": { + "limit": 100, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardEISv3Family", + "localizedValue": "Standard EISv3 Family vCPUs" + } } }, { - "limit": 8, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardDCSFamily", - "localizedValue": "Standard DCS Family vCPUs" + "properties": { + "limit": 8, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardDCSFamily", + "localizedValue": "Standard DCS Family vCPUs" + } } }, { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardNVSv2Family", - "localizedValue": "Standard NVSv2 Family vCPUs" + "properties": { + "limit": 0, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardNVSv2Family", + "localizedValue": "Standard NVSv2 Family vCPUs" + } } }, { - "limit": 0, - "unit": "Count", - "currentValue": 0, - "name": { - "value": "standardMSv2Family", - "localizedValue": "Standard MSv2 Family vCPUs" + "properties": { + "limit": 0, + "unit": "Count", + "currentValue": 0, + "name": { + "value": "standardMSv2Family", + "localizedValue": "Standard MSv2 Family vCPUs" + } } } ], diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getMsSqlUsages.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getMsSqlUsages.json index b0f9dea62988..74b82ac10c9c 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getMsSqlUsages.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/getMsSqlUsages.json @@ -10,31 +10,37 @@ "body": { "value": [ { - "currentValue": 1, - "limit": 20, - "name": { - "localizedValue": "Regional Server Quota for West US", - "value": "ServerQuota" - }, - "unit": "Count" + "properties": { + "currentValue": 1, + "limit": 20, + "name": { + "localizedValue": "Regional Server Quota for West US", + "value": "ServerQuota" + }, + "unit": "Count" + } }, { - "currentValue": 0, - "limit": 1, - "name": { - "localizedValue": "Free Database Count per Subscription for West US", - "value": "SubscriptionFreeDatabaseCount" - }, - "unit": "Count" + "properties": { + "currentValue": 0, + "limit": 1, + "name": { + "localizedValue": "Free Database Count per Subscription for West US", + "value": "SubscriptionFreeDatabaseCount" + }, + "unit": "Count" + } }, { - "currentValue": 365, - "limit": 365, - "name": { - "localizedValue": "Free to Basic Database Upgrade count-down in West US", - "value": "SubscriptionFreeDatabaseDaysLeft" - }, - "unit": "Count" + "properties": { + "currentValue": 365, + "limit": 365, + "name": { + "localizedValue": "Free to Basic Database Upgrade count-down in West US", + "value": "SubscriptionFreeDatabaseDaysLeft" + }, + "unit": "Count" + } } ] } diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/patchComputeQuotaRequest.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/patchComputeQuotaRequest.json index 1092cc425bea..aec6096cdbc1 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/patchComputeQuotaRequest.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/patchComputeQuotaRequest.json @@ -7,10 +7,12 @@ "api-version": "2019-07-19-preview", "If-Match": "F2E0FB94-7F6B-4852-8EE8-67A04BBA6520", "createQuotaRequest": { - "limit": 200, - "unit": "Count", - "name": { - "value": "standardFSv2Family" + "properties": { + "limit": 200, + "unit": "Count", + "name": { + "value": "standardFSv2Family" + } } } }, @@ -35,12 +37,16 @@ "provisioningState": "Succeeded", "message": "", "properties": { - "limit": 200, - "unit": "Count", - "currentValue": 80, - "name": { - "value": "standardFSv2Family", - "localizedValue": "Standard FSv2 Family vCPUs" + "properties": { + "limit": 200, + "unit": "Count", + "currentValue": 160, + "name": { + "value": "standardFSv2Family", + "localizedValue": "Standard FSv2 Family vCPUs" + }, + "quotaPeriod": "", + "properties": {} } } } diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/putComputeOneSkuQuotaRequest.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/putComputeOneSkuQuotaRequest.json index e106b9262465..29dc58a1e447 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/putComputeOneSkuQuotaRequest.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/examples/putComputeOneSkuQuotaRequest.json @@ -7,10 +7,12 @@ "api-version": "2019-07-19-preview", "If-Match": "*", "createQuotaRequest": { - "limit": 200, - "unit": "Count", - "name": { - "value": "standardFSv2Family" + "properties": { + "limit": 200, + "unit": "Count", + "name": { + "value": "standardFSv2Family" + } } } }, @@ -33,14 +35,18 @@ "type": "Microsoft.Capacity/serviceLimits", "properties": { "provisioningState": "Succeeded", - "message": "", + "message": "Request succeeded", "properties": { - "limit": 200, - "unit": "Count", - "currentValue": 160, - "name": { - "value": "standardFSv2Family", - "localizedValue": "Standard FSv2 Family vCPUs" + "properties": { + "limit": 200, + "unit": "Count", + "currentValue": 160, + "name": { + "value": "standardFSv2Family", + "localizedValue": "Standard FSv2 Family vCPUs" + }, + "quotaPeriod": "", + "properties": {} } } } diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/quota.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/quota.json index fa6935b5cdda..66dc47323378 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/quota.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-07-19/quota.json @@ -90,7 +90,7 @@ "QuotaRequests" ], "summary": "Submits a Quota Request for a resource provider at the specified location for the specific resource in the parameter.", - "description": "Submits Quota change request for a resource provider for the specified location for the specific resource in the parameter. To use, first make a Get request to get quota information. This information consists of a list of resources and information regarding those resources. For all the resources in that list which require an update to their quotas, update their limit fields in the response from the Get request to their new values. Then, submit this updated JSON object to this quota request API. This will update the quota to the values specified. The location header in the response will be used to track the status of the quota request. Please check the provisioningState field in the response.", + "description": "Submits Quota change request for a resource provider for the specified location for the specific resource in the parameter. To use, first make a Get request to get quota information for the specific resource. This information consists of information regarding that specific resources. For the specific resource, if it requires an update to the quota, update the limit field in the response from the Get request to the new value of quota. Then, submit this updated JSON object to this quota request API. This will update the quota to the value specified. The location header in the response will be used to track the status of the quota request. Please check the provisioningState field in the response.", "operationId": "QuotaRequest_Create", "x-ms-examples": { "Quotas_Request_listForCompute": { @@ -156,7 +156,7 @@ "QuotaRequests" ], "summary": "Submits a Quota Request for a resource provider at the specified location for the specific resource in the parameter.", - "description": "Submits Quota change request for a resource provider for the specified location for the specific resource in the parameter. To use, first make a Get request to get quota information. This information consists of a list of resources and information regarding those resources. For all the resources in that list which require an update to their quotas, update their limit fields in the response from the Get request to their new values. Then, submit this updated JSON object to this quota request API. This will update the quota to the values specified. The location header in the response will be used to track the status of the quota request. Please check the provisioningState field in the response.", + "description": "Submits Quota change request for a resource provider for the specified location for the specific resource in the parameter. To use, first make a Get request to get quota information for the specific resource. This information consists of information regarding that specific resources. For the specific resource, if it requires an update to the quota, update the limit field in the response from the Get request to the new value of quota. Then, submit this updated JSON object to this quota request API. This will update the quota to the value specified. The location header in the response will be used to track the status of the quota request. Please check the provisioningState field in the response.", "operationId": "QuotaRequest_Update", "x-ms-examples": { "Quotas_Request_PatchForCompute": { @@ -293,7 +293,7 @@ } }, "summary": "Gets the Quota request status by requestId, for the specified resource provider at specified location.", - "description": "Gets the QuotaRequest details and status by the quota requestId for the resources for the resource provider at a specific location. The requestId is returned as response to the Put requests for serviceLimits.", + "description": "Gets the QuotaRequest details and status by the quota request Id for the resources for the resource provider at a specific location. The requestId is returned as response to the Put requests for serviceLimits.", "operationId": "QuotaRequests_GetStatus", "parameters": [ { @@ -368,9 +368,6 @@ "$ref": "#/parameters/SkipTokenParameter" } ], - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "responses": { "200": { "description": "Ok. Sending Quota request status and details", @@ -384,6 +381,9 @@ "$ref": "#/definitions/ExceptionResponse" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, @@ -494,6 +494,16 @@ "type": "object", "description": "Quota limits.", "x-ms-azure-resource": true, + "properties": { + "properties": { + "description": "Quota properties for the resource.", + "$ref": "#/definitions/QuotaProperties" + } + } + }, + "QuotaProperties": { + "description": "Resource quota properties.", + "type": "object", "properties": { "limit": { "description": "The quota limit.", @@ -511,18 +521,7 @@ }, "name": { "description": "Name of the resource provide by the resource Provider. Please use this name property for quotaRequests.", - "properties": { - "value": { - "description": "Resource name.", - "type": "string", - "readOnly": false - }, - "localizedValue": { - "description": "Resource display name.", - "type": "string", - "readOnly": true - } - } + "$ref": "#/definitions/ResourceName" }, "resourceType": { "description": "The Resource Type Name.", @@ -540,6 +539,21 @@ } } }, + "ResourceName": { + "description": "Name of the resource provide by the resource Provider. Please use this name property for quotaRequests.", + "properties": { + "value": { + "description": "Resource name.", + "type": "string", + "readOnly": false + }, + "localizedValue": { + "description": "Resource display name.", + "type": "string", + "readOnly": true + } + } + }, "QuotaLimits": { "description": "Quota limits.", "properties": { @@ -596,18 +610,7 @@ }, "name": { "description": "The Resource name.", - "properties": { - "localizedValue": { - "description": "Resource display name.", - "type": "string", - "readOnly": true - }, - "value": { - "description": "Resource name.", - "type": "string", - "readOnly": true - } - } + "$ref": "#/definitions/ResourceName" }, "resourceType": { "description": "Resource type for which the quota check was made.", @@ -931,7 +934,7 @@ "description": "The email actions.", "properties": { "value": { - "description": "The list of actions based on the success or failure of automatic quota increase action.", + "description": "The list of email actions based on the success or failure of automatic quota increase action.", "type": "array", "items": { "description": "The email recipients for the specific action types.",