From b869aa3854803be37cdc02a99b50afabaa75b2e4 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 15:01:10 -0400 Subject: [PATCH 1/7] Add checkQuotaAvailability to vmwarevirtustream 2019-08-09-preview --- .../examples/Quota_Get.json | 20 +++++ .../2019-08-09-preview/vmwarevirtustream.json | 79 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json new file mode 100644 index 000000000000..38d5c4366ed7 --- /dev/null +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2019-08-09-preview", + "subscriptionId": "{subscription-id}", + "region": { + "region": "eastus" + } + }, + "responses": { + "200": { + "body": { + "hostsRemaining": { + "gp": "0", + "he": "999" + }, + "quotaEnabled": true + } + } + } +} diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 14389afe3a36..5b6d6edc1fbe 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -120,6 +120,51 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.VMwareVirtustream/checkQuotaAvailability": { + "post": { + "tags": [ + "checkQuotaAvailability" + ], + "description": "Return quota for subscription by region", + "operationId": "Quota_Get", + "parameters": [ + { + "$ref": "#/parameters/subscriptionId" + }, + { + "$ref": "#/parameters/apiVersion" + }, + { + "name": "region", + "description": "Region request for quota availability", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/QuotaRegion" + } + } + ], + "responses": { + "200": { + "description": "Request has succeeded", + "schema": { + "$ref": "#/definitions/QuotaGet" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "x-ms-examples": { + "Quota_Get": { + "$ref": "./examples/Quota_Get.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.VMwareVirtustream/privateClouds": { "get": { "operationId": "PrivateClouds_List", @@ -702,6 +747,40 @@ } }, "definitions": { + "HostQuota": { + "description": "Host quotas", + "properties": { + "gp": { + "description": "VS20 host quota", + "type": "" + }, + "he": { + "description": "VS36 host quota", + "type": "" + } + } + }, + "QuotaGet": { + "description": "Subscription quotas", + "properties": { + "hostsRemaining": { + "$ref": "#/definitions/HostQuota" + }, + "quotaEnabled": { + "description": "Subscription has a valid quota", + "type": "boolean" + } + } + }, + "QuotaRegion": { + "description": "Quota region request", + "properties": { + "region": { + "description": "Azure region", + "type": "string" + } + } + }, "Resource": { "description": "The core properties of ARM resources", "properties": { From 3b28528972deb495c056d6192a734b95092dadb7 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 15:18:55 -0400 Subject: [PATCH 2/7] fix missing/invalid types --- .../preview/2019-08-09-preview/examples/Quota_Get.json | 4 ++-- .../preview/2019-08-09-preview/vmwarevirtustream.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json index 38d5c4366ed7..05fa429d9176 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json @@ -10,8 +10,8 @@ "200": { "body": { "hostsRemaining": { - "gp": "0", - "he": "999" + "gp": 0, + "he": 999 }, "quotaEnabled": true } diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 5b6d6edc1fbe..08565951f1a2 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -752,11 +752,11 @@ "properties": { "gp": { "description": "VS20 host quota", - "type": "" + "type": "integer" }, "he": { "description": "VS36 host quota", - "type": "" + "type": "integer" } } }, From 4704c3ad3ba61ca75a8aae29a5630d29cf9d6242 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 15:55:28 -0400 Subject: [PATCH 3/7] update tags --- .../preview/2019-08-09-preview/vmwarevirtustream.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 08565951f1a2..3ba57151b63a 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -41,6 +41,14 @@ { "name": "Clusters", "description": "" + }, + { + "name": "Operations", + "description": "" + }, + { + "name": "Quota", + "description": "" } ], "parameters": { @@ -123,7 +131,7 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.VMwareVirtustream/checkQuotaAvailability": { "post": { "tags": [ - "checkQuotaAvailability" + "Quota" ], "description": "Return quota for subscription by region", "operationId": "Quota_Get", From c3a8951bb64f516ead59e2b74c4664eb52d9febb Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 17:18:18 -0400 Subject: [PATCH 4/7] updated to use location based routing --- .../examples/Quota_Get.json | 5 +-- .../2019-08-09-preview/vmwarevirtustream.json | 37 +++++++------------ 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json index 05fa429d9176..35441ae2967b 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json @@ -1,10 +1,7 @@ { "parameters": { "api-version": "2019-08-09-preview", - "subscriptionId": "{subscription-id}", - "region": { - "region": "eastus" - } + "location": "eastus" }, "responses": { "200": { diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 3ba57151b63a..24a88945404e 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -128,7 +128,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.VMwareVirtustream/checkQuotaAvailability": { + "/providers/Microsoft.VMwareVirtustream/locations/{location}/checkQuotaAvailability": { "post": { "tags": [ "Quota" @@ -137,19 +137,14 @@ "operationId": "Quota_Get", "parameters": [ { - "$ref": "#/parameters/subscriptionId" + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "Azure region" }, { "$ref": "#/parameters/apiVersion" - }, - { - "name": "region", - "description": "Region request for quota availability", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/QuotaRegion" - } } ], "responses": { @@ -760,11 +755,13 @@ "properties": { "gp": { "description": "VS20 host quota", - "type": "integer" + "type": "integer", + "readOnly": true }, "he": { "description": "VS36 host quota", - "type": "integer" + "type": "integer", + "readOnly": true } } }, @@ -775,17 +772,9 @@ "$ref": "#/definitions/HostQuota" }, "quotaEnabled": { - "description": "Subscription has a valid quota", - "type": "boolean" - } - } - }, - "QuotaRegion": { - "description": "Quota region request", - "properties": { - "region": { - "description": "Azure region", - "type": "string" + "description": "Host quota is active for current subscription", + "type": "boolean", + "readOnly": true } } }, From eeb483dcb1b471ff6ab42ba2c3107fde3457df14 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 17:56:02 -0400 Subject: [PATCH 5/7] change description for host quotas --- .../preview/2019-08-09-preview/vmwarevirtustream.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 24a88945404e..89702cb5c502 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -754,12 +754,12 @@ "description": "Host quotas", "properties": { "gp": { - "description": "VS20 host quota", + "description": "Quota for general purpose hosts (VS20)", "type": "integer", "readOnly": true }, "he": { - "description": "VS36 host quota", + "description": "Quota for high end hosts (VS36)", "type": "integer", "readOnly": true } From 9bbe968237dfad0c791a54a5a548273ad9ffb6f2 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Mon, 27 Apr 2020 19:29:16 -0400 Subject: [PATCH 6/7] Update QuotaGet definition --- .../2019-08-09-preview/vmwarevirtustream.json | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 89702cb5c502..2124bd10dec6 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -750,26 +750,17 @@ } }, "definitions": { - "HostQuota": { - "description": "Host quotas", - "properties": { - "gp": { - "description": "Quota for general purpose hosts (VS20)", - "type": "integer", - "readOnly": true - }, - "he": { - "description": "Quota for high end hosts (VS36)", - "type": "integer", - "readOnly": true - } - } - }, "QuotaGet": { "description": "Subscription quotas", "properties": { "hostsRemaining": { - "$ref": "#/definitions/HostQuota" + "description": "Remaining hosts quota by sku type", + "type": "object", + "readOnly": true, + "additionalProperties": { + "type": "integer", + "readOnly": true + } }, "quotaEnabled": { "description": "Host quota is active for current subscription", From ab5f3f21abc1d0aef835f68d01b0a59ba4755da1 Mon Sep 17 00:00:00 2001 From: David Ricciardi Date: Tue, 28 Apr 2020 13:58:22 -0400 Subject: [PATCH 7/7] make checkQuotaAvailability subscription level --- .../preview/2019-08-09-preview/examples/Quota_Get.json | 1 + .../preview/2019-08-09-preview/vmwarevirtustream.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json index 35441ae2967b..cc5b93a176ae 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/examples/Quota_Get.json @@ -1,5 +1,6 @@ { "parameters": { + "subscriptionId": "{subscription-id}", "api-version": "2019-08-09-preview", "location": "eastus" }, diff --git a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json index 2124bd10dec6..a642234f5048 100644 --- a/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json +++ b/specification/vmwarevirtustream/resource-manager/Microsoft.VMwareVirtustream/preview/2019-08-09-preview/vmwarevirtustream.json @@ -128,7 +128,7 @@ } } }, - "/providers/Microsoft.VMwareVirtustream/locations/{location}/checkQuotaAvailability": { + "/subscriptions/{subscriptionId}/providers/Microsoft.VMwareVirtustream/locations/{location}/checkQuotaAvailability": { "post": { "tags": [ "Quota" @@ -136,6 +136,9 @@ "description": "Return quota for subscription by region", "operationId": "Quota_Get", "parameters": [ + { + "$ref": "#/parameters/subscriptionId" + }, { "name": "location", "in": "path",