From 346651741dcafd1a91d0741d726aef7cdac29c4d Mon Sep 17 00:00:00 2001 From: Andrey Severtokov Date: Fri, 23 Mar 2018 12:00:41 -0700 Subject: [PATCH 1/7] Adding BillingMeters API --- .../stable/2016-03-01/Global.json | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json new file mode 100644 index 000000000000..a168bd6d3fa7 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json @@ -0,0 +1,110 @@ +{ + "swagger": "2.0", + "info": { + "version": "2016-03-01", + "title": "Global API Client" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters": { + "get": { + "tags": [ + "Global" + ], + "summary": "Gets a list of meters for a given location.", + "description": "Gets a list of meters for a given location.", + "operationId": "Global_GetBillingMeters", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/BillingMeter" + } + } + } + } + } + } + }, + "definitions": { + "BillingMeter": { + "description": "Billing meter.", + "type": "object", + "properties": { + "meterId": { + "description": "Meter GUID onboarded in Commerce", + "type": "string" + }, + "billingLocation": { + "description": "CSM Location", + "type": "string" + }, + "shortName": { + "description": "Short Name from Azure pricing Page", + "type": "string" + }, + "friendlyName": { + "description": "Meter Resource Name", + "type": "string" + }, + "resourceType": { + "description": "ResourceType meter used for", + "type": "string" + } + } + } + }, + "parameters": { + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).", + "required": true, + "type": "string" + }, + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "API Version", + "required": true, + "type": "string" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} \ No newline at end of file From 2c9ced71b2b53f7039ec9ddbcbe4f23f05897e89 Mon Sep 17 00:00:00 2001 From: Andrey Severtokov Date: Fri, 23 Mar 2018 13:57:07 -0700 Subject: [PATCH 2/7] Adding reference to readme.md --- specification/web/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 398396b1f542..a2c07bb88f80 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -53,6 +53,7 @@ input-file: - Microsoft.Web/stable/2016-03-01/CommonDefinitions.json - Microsoft.Web/stable/2016-03-01/DeletedWebApps.json - Microsoft.Web/stable/2016-03-01/Diagnostics.json +- Microsoft.Web/stable/2016-03-01/Global.json - Microsoft.Web/stable/2016-03-01/Provider.json - Microsoft.Web/stable/2016-03-01/Recommendations.json - Microsoft.Web/stable/2016-03-01/ResourceHealthMetadata.json From 8240f54c53d5980450670dcfbdd5744fc856229f Mon Sep 17 00:00:00 2001 From: Andrey Severtokov Date: Fri, 23 Mar 2018 20:51:32 -0700 Subject: [PATCH 3/7] "Added billingmeters in the correct file" --- .../stable/2016-03-01/Global.json | 110 ------------------ .../stable/2016-03-01/ResourceProvider.json | 96 +++++++++++++++ 2 files changed, 96 insertions(+), 110 deletions(-) delete mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json deleted file mode 100644 index a168bd6d3fa7..000000000000 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/Global.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2016-03-01", - "title": "Global API Client" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters": { - "get": { - "tags": [ - "Global" - ], - "summary": "Gets a list of meters for a given location.", - "description": "Gets a list of meters for a given location.", - "operationId": "Global_GetBillingMeters", - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/BillingMeter" - } - } - } - } - } - } - }, - "definitions": { - "BillingMeter": { - "description": "Billing meter.", - "type": "object", - "properties": { - "meterId": { - "description": "Meter GUID onboarded in Commerce", - "type": "string" - }, - "billingLocation": { - "description": "CSM Location", - "type": "string" - }, - "shortName": { - "description": "Short Name from Azure pricing Page", - "type": "string" - }, - "friendlyName": { - "description": "Meter Resource Name", - "type": "string" - }, - "resourceType": { - "description": "ResourceType meter used for", - "type": "string" - } - } - } - }, - "parameters": { - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).", - "required": true, - "type": "string" - }, - "apiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "API Version", - "required": true, - "type": "string" - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "description": "Azure Active Directory OAuth2 Flow", - "flow": "implicit", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json index 9b29b90d815f..7d8c4250eddc 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json @@ -178,6 +178,44 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters": { + "get": { + "summary": "Gets a list of meters for a given location.", + "description": "Gets a list of meters for a given location.", + "operationId": "ListBillingMeters", + "parameters": [ + { + "name": "billingLocation", + "in": "query", + "description": "Azure Location of billable resource", + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BillingMeterCollection" + } + }, + "default": { + "description": "Default error response", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Web/deploymentLocations": { "get": { @@ -476,6 +514,64 @@ } }, "definitions": { + "BillingMeter": { + "description": "App Service billing entity that contains information about meter which the Azure billing system utilizes to charge users for services.", + "type": "object", + "allOf": [ + { + "$ref": "./CommonDefinitions.json#/definitions/ProxyOnlyResource" + } + ], + "properties": { + "properties": { + "description": "BillingMeter resource specific properties", + "properties": { + "meterId": { + "description": "Meter GUID onboarded in Commerce", + "type": "string" + }, + "billingLocation": { + "description": "Azure Location of billable resource", + "type": "string" + }, + "shortName": { + "description": "Short Name from App Service Azure pricing Page", + "type": "string" + }, + "friendlyName": { + "description": "Friendly name of the meter", + "type": "string" + }, + "resourceType": { + "description": "App Service resource type meter used for", + "type": "string" + } + }, + "x-ms-client-flatten": true + } + } + }, + "BillingMeterCollection": { + "description": "Collection of Billing Meters", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/BillingMeter" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string", + "readOnly": true + } + } + }, "CsmMoveResourceEnvelope": { "description": "Object with a list of the resources that need to be moved and the resource group they should be moved to.", "type": "object", From 202390778e5cb4adc889538442963b4ef045b183 Mon Sep 17 00:00:00 2001 From: andreyse Date: Fri, 23 Mar 2018 20:54:53 -0700 Subject: [PATCH 4/7] Update readme.md --- specification/web/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index a2c07bb88f80..398396b1f542 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -53,7 +53,6 @@ input-file: - Microsoft.Web/stable/2016-03-01/CommonDefinitions.json - Microsoft.Web/stable/2016-03-01/DeletedWebApps.json - Microsoft.Web/stable/2016-03-01/Diagnostics.json -- Microsoft.Web/stable/2016-03-01/Global.json - Microsoft.Web/stable/2016-03-01/Provider.json - Microsoft.Web/stable/2016-03-01/Recommendations.json - Microsoft.Web/stable/2016-03-01/ResourceHealthMetadata.json From c36bac689faa2259063be254236f752adc9a633e Mon Sep 17 00:00:00 2001 From: Andrey Severtokov Date: Fri, 23 Mar 2018 21:19:58 -0700 Subject: [PATCH 5/7] Adding example for ListBillingMeters --- .../examples/ListBillingMeters.json | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json new file mode 100644 index 000000000000..62d09b884c5b --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json @@ -0,0 +1,255 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "2016-03-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/a87d942f-26f3-4b73-abd4-3ad279b97fc9", + "name": "a87d942f-26f3-4b73-abd4-3ad279b97fc9", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "a87d942f-26f3-4b73-abd4-3ad279b97fc9", + "billingLocation": "southcentralus", + "shortName": "I3", + "friendlyName": "Isolated Large App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7819cd57-36a5-4845-a072-58ee70c9f483", + "name": "7819cd57-36a5-4845-a072-58ee70c9f483", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "7819cd57-36a5-4845-a072-58ee70c9f483", + "billingLocation": "southcentralus", + "shortName": "I2", + "friendlyName": "Isolated Medium App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/e8a8b567-6047-460b-a534-17451cc7edf9", + "name": "e8a8b567-6047-460b-a534-17451cc7edf9", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "e8a8b567-6047-460b-a534-17451cc7edf9", + "billingLocation": "southcentralus", + "shortName": "IM", + "friendlyName": "Isolated Monthly Stamp Fee", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c8b787af-eeb7-4d96-97a3-630a00021664", + "name": "c8b787af-eeb7-4d96-97a3-630a00021664", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "c8b787af-eeb7-4d96-97a3-630a00021664", + "billingLocation": "southcentralus", + "shortName": "I1", + "friendlyName": "Isolated Small App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/6318825b-98b6-4b3c-883f-52a9d1560dae", + "name": "6318825b-98b6-4b3c-883f-52a9d1560dae", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "6318825b-98b6-4b3c-883f-52a9d1560dae", + "billingLocation": "southcentralus", + "shortName": "IF", + "friendlyName": "Isolated Front End App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7a3b96e3-1c68-4506-86d8-224b89b3347f", + "name": "7a3b96e3-1c68-4506-86d8-224b89b3347f", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "7a3b96e3-1c68-4506-86d8-224b89b3347f", + "billingLocation": "southcentralus", + "shortName": "P2", + "friendlyName": "Premium Medium App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/db2ae25a-4469-4fa3-9c27-63ac21da6b30", + "name": "db2ae25a-4469-4fa3-9c27-63ac21da6b30", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "db2ae25a-4469-4fa3-9c27-63ac21da6b30", + "billingLocation": "southcentralus", + "shortName": "P1", + "friendlyName": "Premium Small App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", + "name": "ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", + "billingLocation": "southcentralus", + "shortName": "P3", + "friendlyName": "Premium Large App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", + "name": "7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", + "billingLocation": "southcentralus", + "shortName": "S3", + "friendlyName": "Standard Large App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/64d48263-32ab-4359-b05b-8626b0974e17", + "name": "64d48263-32ab-4359-b05b-8626b0974e17", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "64d48263-32ab-4359-b05b-8626b0974e17", + "billingLocation": "southcentralus", + "shortName": "S2", + "friendlyName": "Standard Medium App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/505db374-df8a-44df-9d8c-13c14b61dee1", + "name": "505db374-df8a-44df-9d8c-13c14b61dee1", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "505db374-df8a-44df-9d8c-13c14b61dee1", + "billingLocation": "southcentralus", + "shortName": "S1", + "friendlyName": "Standard Small App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7ce53686-7c67-470b-ae6f-3996cbb02fbb", + "name": "7ce53686-7c67-470b-ae6f-3996cbb02fbb", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "7ce53686-7c67-470b-ae6f-3996cbb02fbb", + "billingLocation": "southcentralus", + "shortName": "B3", + "friendlyName": "Basic Large App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/4f1fa8fe-ffed-48fa-9969-26a150775b60", + "name": "4f1fa8fe-ffed-48fa-9969-26a150775b60", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "4f1fa8fe-ffed-48fa-9969-26a150775b60", + "billingLocation": "southcentralus", + "shortName": "B2", + "friendlyName": "Basic Medium App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/ba302f7a-078b-4141-a636-a76315ba44ce", + "name": "ba302f7a-078b-4141-a636-a76315ba44ce", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "ba302f7a-078b-4141-a636-a76315ba44ce", + "billingLocation": "southcentralus", + "shortName": "B1", + "friendlyName": "Basic Small App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/67cf08ec-f742-4d89-ba10-60ff525dd71f", + "name": "67cf08ec-f742-4d89-ba10-60ff525dd71f", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "67cf08ec-f742-4d89-ba10-60ff525dd71f", + "billingLocation": "southcentralus", + "shortName": "P4", + "friendlyName": "Premium Extra Large App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/0c3885bd-351d-4c28-830a-446d7bb4295c", + "name": "0c3885bd-351d-4c28-830a-446d7bb4295c", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "0c3885bd-351d-4c28-830a-446d7bb4295c", + "billingLocation": "southcentralus", + "shortName": "D1", + "friendlyName": "Shared App Service Hours", + "resourceType": "site" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c0f5cb45-6fb1-41c9-8545-72ad400d9da4", + "name": "c0f5cb45-6fb1-41c9-8545-72ad400d9da4", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "c0f5cb45-6fb1-41c9-8545-72ad400d9da4", + "billingLocation": "southcentralus", + "shortName": "F1", + "friendlyName": "Free App Service", + "resourceType": "site" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c6dd980d-e1e6-4369-80b9-cc34aa027d6c", + "name": "c6dd980d-e1e6-4369-80b9-cc34aa027d6c", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "c6dd980d-e1e6-4369-80b9-cc34aa027d6c", + "billingLocation": "southcentralus", + "shortName": "P1v2", + "friendlyName": "Premium V2 Small App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c1153483-9560-4313-b95b-7be141ee305f", + "name": "c1153483-9560-4313-b95b-7be141ee305f", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "c1153483-9560-4313-b95b-7be141ee305f", + "billingLocation": "southcentralus", + "shortName": "P2v2", + "friendlyName": "Premium V2 Medium App Service Hours", + "resourceType": "serverfarm" + } + }, + { + "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/25d05ec4-b606-4a70-a732-0daae48180e7", + "name": "25d05ec4-b606-4a70-a732-0daae48180e7", + "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "25d05ec4-b606-4a70-a732-0daae48180e7", + "billingLocation": "southcentralus", + "shortName": "P3v2", + "friendlyName": "Premium V2 Large App Service Hours", + "resourceType": "serverfarm" + } + } + ] + } + } + } +} \ No newline at end of file From 7b6a81c657b9440f942fafc8f72b4f585c30674f Mon Sep 17 00:00:00 2001 From: andreyse Date: Thu, 29 Mar 2018 15:04:18 -0700 Subject: [PATCH 6/7] Update ResourceProvider.json --- .../Microsoft.Web/stable/2016-03-01/ResourceProvider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json index 7d8c4250eddc..f13666962d70 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json @@ -179,7 +179,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters": { "get": { "summary": "Gets a list of meters for a given location.", "description": "Gets a list of meters for a given location.", From 43630ab2c0840a27fb4b6660246b95784e1417e9 Mon Sep 17 00:00:00 2001 From: andreyse Date: Thu, 29 Mar 2018 15:16:38 -0700 Subject: [PATCH 7/7] Addressing comments --- .../stable/2016-03-01/ResourceProvider.json | 10 +- .../examples/ListBillingMeters.json | 254 +----------------- 2 files changed, 14 insertions(+), 250 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json index 7d8c4250eddc..504599e7de42 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/ResourceProvider.json @@ -183,7 +183,7 @@ "get": { "summary": "Gets a list of meters for a given location.", "description": "Gets a list of meters for a given location.", - "operationId": "ListBillingMeters", + "operationId": "BillingMeters_List", "parameters": [ { "name": "billingLocation", @@ -204,12 +204,6 @@ "schema": { "$ref": "#/definitions/BillingMeterCollection" } - }, - "default": { - "description": "Default error response", - "schema": { - "$ref": "./CommonDefinitions.json#/definitions/ErrorResponse" - } } }, "x-ms-pageable": { @@ -559,7 +553,7 @@ "type": "object", "properties": { "value": { - "description": "Collection of resources.", + "description": "Collection of Billing Meters.", "type": "array", "items": { "$ref": "#/definitions/BillingMeter" diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json index 62d09b884c5b..2189bce49603 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2016-03-01/examples/ListBillingMeters.json @@ -1,254 +1,24 @@ { "parameters": { - "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "subscriptionId": "{subId}", "api-version": "2016-03-01" }, "responses": { "200": { "headers": {}, "body": { - "value": [ - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/a87d942f-26f3-4b73-abd4-3ad279b97fc9", - "name": "a87d942f-26f3-4b73-abd4-3ad279b97fc9", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "a87d942f-26f3-4b73-abd4-3ad279b97fc9", - "billingLocation": "southcentralus", - "shortName": "I3", - "friendlyName": "Isolated Large App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7819cd57-36a5-4845-a072-58ee70c9f483", - "name": "7819cd57-36a5-4845-a072-58ee70c9f483", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "7819cd57-36a5-4845-a072-58ee70c9f483", - "billingLocation": "southcentralus", - "shortName": "I2", - "friendlyName": "Isolated Medium App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/e8a8b567-6047-460b-a534-17451cc7edf9", - "name": "e8a8b567-6047-460b-a534-17451cc7edf9", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "e8a8b567-6047-460b-a534-17451cc7edf9", - "billingLocation": "southcentralus", - "shortName": "IM", - "friendlyName": "Isolated Monthly Stamp Fee", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c8b787af-eeb7-4d96-97a3-630a00021664", - "name": "c8b787af-eeb7-4d96-97a3-630a00021664", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "c8b787af-eeb7-4d96-97a3-630a00021664", - "billingLocation": "southcentralus", - "shortName": "I1", - "friendlyName": "Isolated Small App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/6318825b-98b6-4b3c-883f-52a9d1560dae", - "name": "6318825b-98b6-4b3c-883f-52a9d1560dae", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "6318825b-98b6-4b3c-883f-52a9d1560dae", - "billingLocation": "southcentralus", - "shortName": "IF", - "friendlyName": "Isolated Front End App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7a3b96e3-1c68-4506-86d8-224b89b3347f", - "name": "7a3b96e3-1c68-4506-86d8-224b89b3347f", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "7a3b96e3-1c68-4506-86d8-224b89b3347f", - "billingLocation": "southcentralus", - "shortName": "P2", - "friendlyName": "Premium Medium App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/db2ae25a-4469-4fa3-9c27-63ac21da6b30", - "name": "db2ae25a-4469-4fa3-9c27-63ac21da6b30", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "db2ae25a-4469-4fa3-9c27-63ac21da6b30", - "billingLocation": "southcentralus", - "shortName": "P1", - "friendlyName": "Premium Small App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", - "name": "ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "ef5d838f-bed0-4e72-8fb2-ec32d6a715f1", - "billingLocation": "southcentralus", - "shortName": "P3", - "friendlyName": "Premium Large App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", - "name": "7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "7fadaaec-3afd-4afb-89a7-cdb1e3cb702b", - "billingLocation": "southcentralus", - "shortName": "S3", - "friendlyName": "Standard Large App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/64d48263-32ab-4359-b05b-8626b0974e17", - "name": "64d48263-32ab-4359-b05b-8626b0974e17", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "64d48263-32ab-4359-b05b-8626b0974e17", - "billingLocation": "southcentralus", - "shortName": "S2", - "friendlyName": "Standard Medium App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/505db374-df8a-44df-9d8c-13c14b61dee1", - "name": "505db374-df8a-44df-9d8c-13c14b61dee1", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "505db374-df8a-44df-9d8c-13c14b61dee1", - "billingLocation": "southcentralus", - "shortName": "S1", - "friendlyName": "Standard Small App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/7ce53686-7c67-470b-ae6f-3996cbb02fbb", - "name": "7ce53686-7c67-470b-ae6f-3996cbb02fbb", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "7ce53686-7c67-470b-ae6f-3996cbb02fbb", - "billingLocation": "southcentralus", - "shortName": "B3", - "friendlyName": "Basic Large App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/4f1fa8fe-ffed-48fa-9969-26a150775b60", - "name": "4f1fa8fe-ffed-48fa-9969-26a150775b60", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "4f1fa8fe-ffed-48fa-9969-26a150775b60", - "billingLocation": "southcentralus", - "shortName": "B2", - "friendlyName": "Basic Medium App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/ba302f7a-078b-4141-a636-a76315ba44ce", - "name": "ba302f7a-078b-4141-a636-a76315ba44ce", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "ba302f7a-078b-4141-a636-a76315ba44ce", - "billingLocation": "southcentralus", - "shortName": "B1", - "friendlyName": "Basic Small App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/67cf08ec-f742-4d89-ba10-60ff525dd71f", - "name": "67cf08ec-f742-4d89-ba10-60ff525dd71f", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "67cf08ec-f742-4d89-ba10-60ff525dd71f", - "billingLocation": "southcentralus", - "shortName": "P4", - "friendlyName": "Premium Extra Large App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/0c3885bd-351d-4c28-830a-446d7bb4295c", - "name": "0c3885bd-351d-4c28-830a-446d7bb4295c", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "0c3885bd-351d-4c28-830a-446d7bb4295c", - "billingLocation": "southcentralus", - "shortName": "D1", - "friendlyName": "Shared App Service Hours", - "resourceType": "site" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c0f5cb45-6fb1-41c9-8545-72ad400d9da4", - "name": "c0f5cb45-6fb1-41c9-8545-72ad400d9da4", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "c0f5cb45-6fb1-41c9-8545-72ad400d9da4", - "billingLocation": "southcentralus", - "shortName": "F1", - "friendlyName": "Free App Service", - "resourceType": "site" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c6dd980d-e1e6-4369-80b9-cc34aa027d6c", - "name": "c6dd980d-e1e6-4369-80b9-cc34aa027d6c", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "c6dd980d-e1e6-4369-80b9-cc34aa027d6c", - "billingLocation": "southcentralus", - "shortName": "P1v2", - "friendlyName": "Premium V2 Small App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/c1153483-9560-4313-b95b-7be141ee305f", - "name": "c1153483-9560-4313-b95b-7be141ee305f", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "c1153483-9560-4313-b95b-7be141ee305f", - "billingLocation": "southcentralus", - "shortName": "P2v2", - "friendlyName": "Premium V2 Medium App Service Hours", - "resourceType": "serverfarm" - } - }, - { - "id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters/25d05ec4-b606-4a70-a732-0daae48180e7", - "name": "25d05ec4-b606-4a70-a732-0daae48180e7", - "type": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/billingMeters", - "properties": { - "meterId": "25d05ec4-b606-4a70-a732-0daae48180e7", - "billingLocation": "southcentralus", - "shortName": "P3v2", - "friendlyName": "Premium V2 Large App Service Hours", - "resourceType": "serverfarm" - } + "value": { + "id": "subscriptions/{subId}/providers/Microsoft.Web/billingMeters/{meterId}", + "name": "{meterId}", + "type": "subscriptions/{subId}/providers/Microsoft.Web/billingMeters", + "properties": { + "meterId": "{meterId}", + "billingLocation": "southcentralus", + "shortName": "I3", + "friendlyName": "Isolated Large App Service Hours", + "resourceType": "serverfarm" } - ] + } } } }