From 660189d73640a15cfb2c93c04a6a6e593dc42647 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 02:06:01 -0700 Subject: [PATCH 01/29] GetReservationDetailsReport by billing account changes --- .../stable/2019-11-01/costmanagement.json | 158 ++++++++++++++++++ .../examples/getReservationDetailsReport.json | 16 ++ .../getReservationDetailsReportStatus.json | 22 +++ 3 files changed, 196 insertions(+) create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 2f0fc9a8dc97..358d7a4f9312 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1098,6 +1098,124 @@ } } }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReport_ByBillingAccountId_Async", + "description": "Lists the reservations details for provided date range asynchronously.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationDetails": { + "$ref": "./examples/getReservationDetailsReport.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "name": "$filter", + "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge' ", + "in": "query", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Accepted.", + "headers": { + "Operation-Location": { + "description": "The URL where the status of the asynchronous operation can be checked.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "string" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{StatusId}": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReport_ByBillingAccountId_Status", + "description": "Lists the reservations details for provided date range asynchronously.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "getReservationDetailsReportStatus": { + "$ref": "./examples/getReservationDetailsReportStatus.json" + }, + "getReservationDetailsReport": { + "$ref": "./examples/getReservationDetailsReport.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "name": "StatusId", + "description": "Status id for each the operation status needs to be retrieved.", + "in": "path", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Ok.", + "headers": { + "Operation-Location": { + "description": "The URL where the status of the asynchronous operation can be checked.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/Status" + } + }, + "200": { + "description": "Ok.", + "schema": { + "$ref": "#/definitions/StatusWithLocation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/{scope}/providers/Microsoft.CostManagement/exports": { "get": { "tags": [ @@ -2611,6 +2729,46 @@ } } }, + "Status": { + "description": "The status of the long running operation.", + "properties": { + "status": { + "description": "The status of the long running operation.", + "type": "string", + "enum": [ + "running", + "succeeded", + "failed" + ], + "x-ms-enum": { + "name": "Status", + "modelAsString": true + } + } + } + }, + "StatusWithLocation": { + "description": "The status of the long running operation.", + "properties": { + "status": { + "description": "The status of the long running operation.", + "type": "string", + "enum": [ + "running", + "succeeded", + "failed" + ], + "x-ms-enum": { + "name": "Status", + "modelAsString": true + } + }, + "resourceLocation": { + "description": "A location url of the resource generated", + "type": "string" + } + } + }, "QueryDatasetConfiguration": { "description": "The configuration of dataset in the query.", "properties": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json new file mode 100644 index 000000000000..15eedd3497a7 --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "billingAccountId": "9845612", + "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Retry-After": "60" + } + } + } + } + \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json new file mode 100644 index 000000000000..5487875c9f1e --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "billingAccountId": "9845612", + "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Retry-After": "60" + }, + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } + } + } + } + } + \ No newline at end of file From 0301539b199db1c39fa1b9bc3986d0bcebe2e147 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 03:07:28 -0700 Subject: [PATCH 02/29] Review changes --- .../stable/2019-11-01/costmanagement.json | 18 ++++++++--------- .../examples/getReservationDetailsReport.json | 3 ++- .../getReservationDetailsReportStatus.json | 20 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 358d7a4f9312..46eb5a4e51ec 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1103,10 +1103,10 @@ "tags": [ "ReservedInstances" ], - "operationId": "GetReservationDetailsReport_ByBillingAccountId_Async", + "operationId": "GetReservationDetailsReport_ByBillingAccountId", "description": "Lists the reservations details for provided date range asynchronously.", "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, "x-ms-examples": { "ReservationDetails": { @@ -1133,12 +1133,12 @@ "description": "Accepted.", "headers": { "Operation-Location": { - "description": "The URL where the status of the asynchronous operation can be checked.", + "description": "The URL to check the status of the asynchronous operation.", "type": "string" }, "Retry-After": { "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" + "type": "integer" } } }, @@ -1156,10 +1156,10 @@ "tags": [ "ReservedInstances" ], - "operationId": "GetReservationDetailsReport_ByBillingAccountId_Status", - "description": "Lists the reservations details for provided date range asynchronously.", + "operationId": "GetReservationDetailsReportStatus_ByBillingAccountId", + "description": "Get the reservations details report availability status.", "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, "x-ms-examples": { "getReservationDetailsReportStatus": { @@ -1175,7 +1175,7 @@ }, { "name": "StatusId", - "description": "Status id for each the operation status needs to be retrieved.", + "description": "Status id for each of the operation requested.", "in": "path", "required": true, "type": "string" @@ -1189,7 +1189,7 @@ "description": "Ok.", "headers": { "Operation-Location": { - "description": "The URL where the status of the asynchronous operation can be checked.", + "description": "The URL to check the status of the asynchronous operation.", "type": "string" }, "Retry-After": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json index 15eedd3497a7..97cb45f227d8 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json @@ -9,7 +9,8 @@ "headers": { "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", "Retry-After": "60" - } + }, + "body": {} } } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json index 5487875c9f1e..d6d4a1ce9e50 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json @@ -1,14 +1,16 @@ { "parameters": { - "billingAccountId": "9845612", - "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05", - "api-version": "2019-11-01" + "billingAccountId": "9845612", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" }, "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", - "Retry-After": "60" + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": {} }, "200": { "body": { @@ -16,7 +18,5 @@ "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" } } - } } - } - \ No newline at end of file +} \ No newline at end of file From 6b893f5f235f57bda0689648443e8f137cb62efa Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 03:46:32 -0700 Subject: [PATCH 03/29] MISC --- .../stable/2019-11-01/costmanagement.json | 11 ++++------- ... GetReservationDetailsReportByBillingAccount.json} | 3 +-- ...servationDetailsReportStatusByBillingAccount.json} | 4 +++- 3 files changed, 8 insertions(+), 10 deletions(-) rename specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/{getReservationDetailsReport.json => GetReservationDetailsReportByBillingAccount.json} (94%) rename specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/{getReservationDetailsReportStatus.json => GetReservationDetailsReportStatusByBillingAccount.json} (92%) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 46eb5a4e51ec..9546d89114db 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1110,7 +1110,7 @@ }, "x-ms-examples": { "ReservationDetails": { - "$ref": "./examples/getReservationDetailsReport.json" + "$ref": "./examples/GetReservationDetailsReportByBillingAccount.json" } }, "parameters": [ @@ -1163,10 +1163,7 @@ }, "x-ms-examples": { "getReservationDetailsReportStatus": { - "$ref": "./examples/getReservationDetailsReportStatus.json" - }, - "getReservationDetailsReport": { - "$ref": "./examples/getReservationDetailsReport.json" + "$ref": "./examples/GetReservationDetailsReportStatusByBillingAccount.json" } }, "parameters": [ @@ -1175,7 +1172,7 @@ }, { "name": "StatusId", - "description": "Status id for each of the operation requested.", + "description": "Status id for an operation requested.", "in": "path", "required": true, "type": "string" @@ -2741,7 +2738,7 @@ "failed" ], "x-ms-enum": { - "name": "Status", + "name": "StatusType", "modelAsString": true } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json similarity index 94% rename from specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json rename to specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index 97cb45f227d8..15eedd3497a7 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReport.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -9,8 +9,7 @@ "headers": { "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", "Retry-After": "60" - }, - "body": {} + } } } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json similarity index 92% rename from specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json rename to specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json index d6d4a1ce9e50..12b3583829b1 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/getReservationDetailsReportStatus.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json @@ -10,7 +10,9 @@ "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", "Retry-After": "60" }, - "body": {} + "body": { + "status": "running" + } }, "200": { "body": { From 2e4baf2c37ece57a928282fd05854bc57d6d24d7 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 08:52:49 -0700 Subject: [PATCH 04/29] Fixing error --- .../stable/2019-11-01/costmanagement.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 9546d89114db..67abd9f133cd 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1171,7 +1171,7 @@ "$ref": "#/parameters/billingAccountIdParameter" }, { - "name": "StatusId", + "name": "statusId", "description": "Status id for an operation requested.", "in": "path", "required": true, @@ -2761,7 +2761,7 @@ } }, "resourceLocation": { - "description": "A location url of the resource generated", + "description": "A location url of the resource generated.", "type": "string" } } From fc60344ec6cafc063ccfdef68c4b40d20069fb11 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 09:03:56 -0700 Subject: [PATCH 05/29] Fix --- .../stable/2019-11-01/costmanagement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 67abd9f133cd..8bfd61dcfcea 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1151,7 +1151,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{StatusId}": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { "post": { "tags": [ "ReservedInstances" From 7447c6e84b3998e67e4f12d25768927c09a5311c Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 11:12:59 -0700 Subject: [PATCH 06/29] Adding all Async APIs --- .../stable/2019-11-01/costmanagement.json | 411 +++++++++++++++++- ...ervationDetailsReportByBillingAccount.json | 3 +- ...ervationDetailsReportByBillingProfile.json | 18 + ...ReservationDetailsReportByReservation.json | 18 + ...vationDetailsReportByReservationOrder.json | 17 + ...onDetailsReportStatusByBillingProfile.json | 25 ++ ...ationDetailsReportStatusByReservation.json | 25 ++ ...DetailsReportStatusByReservationOrder.json | 24 + 8 files changed, 527 insertions(+), 14 deletions(-) create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 8bfd61dcfcea..1c01e6378438 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1118,11 +1118,10 @@ "$ref": "#/parameters/billingAccountIdParameter" }, { - "name": "$filter", - "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge' ", - "in": "query", - "required": true, - "type": "string" + "$ref": "#/parameters/startDateParameter" + }, + { + "$ref": "#/parameters/endDateParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -1130,7 +1129,7 @@ ], "responses": { "202": { - "description": "Accepted.", + "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", "headers": { "Operation-Location": { "description": "The URL to check the status of the asynchronous operation.", @@ -1171,11 +1170,7 @@ "$ref": "#/parameters/billingAccountIdParameter" }, { - "name": "statusId", - "description": "Status id for an operation requested.", - "in": "path", - "required": true, - "type": "string" + "$ref": "#/parameters/statusIdParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -1183,7 +1178,7 @@ ], "responses": { "202": { - "description": "Ok.", + "description": "Request is still processing.", "headers": { "Operation-Location": { "description": "The URL to check the status of the asynchronous operation.", @@ -1199,7 +1194,349 @@ } }, "200": { + "description": "Request processing completed.", + "schema": { + "$ref": "#/definitions/StatusWithLocation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReport_ByBillingProfileId", + "description": "Lists the reservations details for provided date range asynchronously.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "ReservationDetails": { + "$ref": "./examples/GetReservationDetailsReportByBillingProfile.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/billingProfileIdParameter" + }, + { + "$ref": "#/parameters/startDateParameter" + }, + { + "$ref": "#/parameters/endDateParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", + "headers": { + "Operation-Location": { + "description": "The URL to check the status of the asynchronous operation.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "integer" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReportStatus_ByBillingProfileId", + "description": "Get the reservations details report availability status.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "getReservationDetailsReportStatus": { + "$ref": "./examples/GetReservationDetailsReportStatusByBillingProfile.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/billingProfileIdParameter" + }, + { + "$ref": "#/parameters/statusIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { "description": "Ok.", + "headers": { + "Operation-Location": { + "description": "Request is still processing.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/Status" + } + }, + "200": { + "description": "Request processing completed.", + "schema": { + "$ref": "#/definitions/StatusWithLocation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReport_ByReservationOrderId", + "description": "Lists the reservations details for provided date range asynchronously.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "ReservationDetails": { + "$ref": "./examples/GetReservationDetailsReportByReservationOrder.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/startDateParameter" + }, + { + "$ref": "#/parameters/endDateParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", + "headers": { + "Operation-Location": { + "description": "The URL to check the status of the asynchronous operation.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "integer" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReportStatus_ByReservationOrderId", + "description": "Get the reservations details report availability status.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "getReservationDetailsReportStatus": { + "$ref": "./examples/GetReservationDetailsReportStatusByReservationOrder.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/statusIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Request is still processing.", + "headers": { + "Operation-Location": { + "description": "The URL to check the status of the asynchronous operation.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/Status" + } + }, + "200": { + "description": "Request processing completed.", + "schema": { + "$ref": "#/definitions/StatusWithLocation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReport_ByReservationId", + "description": "Lists the reservations details for provided date range asynchronously.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "ReservationDetails": { + "$ref": "./examples/GetReservationDetailsReportByReservation.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/reservationIdParameter" + }, + { + "$ref": "#/parameters/startDateParameter" + }, + { + "$ref": "#/parameters/endDateParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", + "headers": { + "Operation-Location": { + "description": "The URL to check the status of the asynchronous operation.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "integer" + } + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { + "post": { + "tags": [ + "ReservedInstances" + ], + "operationId": "GetReservationDetailsReportStatus_ByReservationId", + "description": "Get the reservations details report availability status.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" + }, + "x-ms-examples": { + "getReservationDetailsReportStatus": { + "$ref": "./examples/GetReservationDetailsReportStatusByReservation.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/reservationIdParameter" + }, + { + "$ref": "#/parameters/statusIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Request is still processing.", + "headers": { + "Operation-Location": { + "description": "The URL to check the status of the asynchronous operation.", + "type": "string" + }, + "Retry-After": { + "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/Status" + } + }, + "200": { + "description": "Request processing completed.", "schema": { "$ref": "#/definitions/StatusWithLocation" } @@ -3223,10 +3560,58 @@ "type": "string", "x-ms-parameter-location": "method" }, + "startDateParameter": { + "name": "startDate", + "in": "query", + "description": "Start Date", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "endDateParameter": { + "name": "endDate", + "in": "query", + "description": "End Date", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "statusIdParameter": { + "name": "statusId", + "description": "Status id for an operation requested.", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "billingAccountIdParameter": { "name": "billingAccountId", "in": "path", - "description": "BillingAccount ID", + "description": "Enrollment ID (Legacy BillingAccount ID)", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "billingProfileIdParameter": { + "name": "billingProfileId", + "in": "path", + "description": "BillingProfile ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "reservationIdParameter": { + "name": "reservationId", + "in": "path", + "description": "Reservation ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "reservationOrderIdParameter": { + "name": "reservationOrderId", + "in": "path", + "description": "Reservation Order ID", "required": true, "type": "string", "x-ms-parameter-location": "method" diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index 15eedd3497a7..678371e38c2d 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -1,7 +1,8 @@ { "parameters": { "billingAccountId": "9845612", - "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05", + "startDate": "2020-01-01", + "endDate": "2020-01-30", "api-version": "2019-11-01" }, "responses": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json new file mode 100644 index 000000000000..7940fdab0004 --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "billingAccountId": "9845612", + "billingProfileId": "CZSFR-SDFXC-DSDF", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/billingProfiles/billingProfileId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Retry-After": "60" + } + } + } + } + \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json new file mode 100644 index 000000000000..d29b410a0574 --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "reservationOrderId": "dfgtefrg-af6b-41dd-a622-e6f4fc60c3ee", + "reservationId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/reservations/reservationId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Retry-After": "60" + } + } + } + } + \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json new file mode 100644 index 000000000000..7af9d127642c --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "reservationOrderId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Retry-After": "60" + } + } + } + } + \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json new file mode 100644 index 000000000000..1474c29edc37 --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "billingAccountId": "9845612", + "billingProfileId": "CZSFR-SDFXC-DSDF", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/billingProfiles/billingProfileId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": { + "status": "running" + } + }, + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } + } + } +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json new file mode 100644 index 000000000000..74b0f2e360ba --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "reservationOrderId": "dfgtefrg-af6b-41dd-a622-e6f4fc60c3ee", + "reservationId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/reservations/reservationId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": { + "status": "running" + } + }, + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } + } + } +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json new file mode 100644 index 000000000000..f8bcb95ac71f --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "reservationOrderId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": { + "status": "running" + } + }, + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } + } + } +} \ No newline at end of file From d360135729f0f80a0662cca9a8ee6901c74e8681 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 11:49:46 -0700 Subject: [PATCH 07/29] MISC --- .../stable/2019-11-01/costmanagement.json | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 1c01e6378438..63c0b89f48c7 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1104,7 +1104,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReport_ByBillingAccountId", - "description": "Lists the reservations details for provided date range asynchronously.", + "description": "Lists the reservations details for provided date range asynchronously based on enrollment id.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1115,7 +1115,7 @@ }, "parameters": [ { - "$ref": "#/parameters/billingAccountIdParameter" + "$ref": "#/parameters/enrollmentIdParameter" }, { "$ref": "#/parameters/startDateParameter" @@ -1156,7 +1156,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReportStatus_ByBillingAccountId", - "description": "Get the reservations details report availability status.", + "description": "Get the reservations details report availability status by enrollment id.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1167,7 +1167,7 @@ }, "parameters": [ { - "$ref": "#/parameters/billingAccountIdParameter" + "$ref": "#/parameters/enrollmentIdParameter" }, { "$ref": "#/parameters/statusIdParameter" @@ -1214,7 +1214,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReport_ByBillingProfileId", - "description": "Lists the reservations details for provided date range asynchronously.", + "description": "Lists the reservations details for provided date range asynchronously by billing profile.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1269,7 +1269,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReportStatus_ByBillingProfileId", - "description": "Get the reservations details report availability status.", + "description": "Get the reservations details report availability status by billing profile.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1330,7 +1330,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReport_ByReservationOrderId", - "description": "Lists the reservations details for provided date range asynchronously.", + "description": "Lists the reservations details for provided date range asynchronously by reservation order.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1382,7 +1382,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReportStatus_ByReservationOrderId", - "description": "Get the reservations details report availability status.", + "description": "Get the reservations details report availability status by reservation order.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1440,7 +1440,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReport_ByReservationId", - "description": "Lists the reservations details for provided date range asynchronously.", + "description": "Lists the reservations details for provided date range asynchronously by reservation.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1495,7 +1495,7 @@ "ReservedInstances" ], "operationId": "GetReservationDetailsReportStatus_ByReservationId", - "description": "Get the reservations details report availability status.", + "description": "Get the reservations details report availability status by reservation.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -3584,7 +3584,7 @@ "type": "string", "x-ms-parameter-location": "method" }, - "billingAccountIdParameter": { + "enrollmentIdParameter": { "name": "billingAccountId", "in": "path", "description": "Enrollment ID (Legacy BillingAccount ID)", @@ -3592,6 +3592,14 @@ "type": "string", "x-ms-parameter-location": "method" }, + "billingAccountIdParameter": { + "name": "billingAccountId", + "in": "path", + "description": "BillingAccount ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "billingProfileIdParameter": { "name": "billingProfileId", "in": "path", From ca259d042681a7679a81513fd8db34b585245db0 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Wed, 22 Jul 2020 12:40:33 -0700 Subject: [PATCH 08/29] Review changes --- .../stable/2019-11-01/costmanagement.json | 226 ------------------ ...ervationDetailsReportByBillingAccount.json | 2 +- ...ervationDetailsReportByBillingProfile.json | 4 +- ...ReservationDetailsReportByReservation.json | 18 -- ...vationDetailsReportByReservationOrder.json | 17 -- ...onDetailsReportStatusByBillingAccount.json | 2 +- ...onDetailsReportStatusByBillingProfile.json | 4 +- ...ationDetailsReportStatusByReservation.json | 25 -- ...DetailsReportStatusByReservationOrder.json | 24 -- 9 files changed, 6 insertions(+), 316 deletions(-) delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 63c0b89f48c7..72418125938e 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1324,232 +1324,6 @@ } } }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { - "post": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReport_ByReservationOrderId", - "description": "Lists the reservations details for provided date range asynchronously by reservation order.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "ReservationDetails": { - "$ref": "./examples/GetReservationDetailsReportByReservationOrder.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/reservationOrderIdParameter" - }, - { - "$ref": "#/parameters/startDateParameter" - }, - { - "$ref": "#/parameters/endDateParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", - "headers": { - "Operation-Location": { - "description": "The URL to check the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "integer" - } - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { - "post": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReportStatus_ByReservationOrderId", - "description": "Get the reservations details report availability status by reservation order.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "getReservationDetailsReportStatus": { - "$ref": "./examples/GetReservationDetailsReportStatusByReservationOrder.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/reservationOrderIdParameter" - }, - { - "$ref": "#/parameters/statusIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Request is still processing.", - "headers": { - "Operation-Location": { - "description": "The URL to check the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - }, - "schema": { - "$ref": "#/definitions/Status" - } - }, - "200": { - "description": "Request processing completed.", - "schema": { - "$ref": "#/definitions/StatusWithLocation" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { - "post": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReport_ByReservationId", - "description": "Lists the reservations details for provided date range asynchronously by reservation.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "ReservationDetails": { - "$ref": "./examples/GetReservationDetailsReportByReservation.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/reservationOrderIdParameter" - }, - { - "$ref": "#/parameters/reservationIdParameter" - }, - { - "$ref": "#/parameters/startDateParameter" - }, - { - "$ref": "#/parameters/endDateParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", - "headers": { - "Operation-Location": { - "description": "The URL to check the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "integer" - } - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { - "post": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReportStatus_ByReservationId", - "description": "Get the reservations details report availability status by reservation.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "getReservationDetailsReportStatus": { - "$ref": "./examples/GetReservationDetailsReportStatusByReservation.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/reservationOrderIdParameter" - }, - { - "$ref": "#/parameters/reservationIdParameter" - }, - { - "$ref": "#/parameters/statusIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Request is still processing.", - "headers": { - "Operation-Location": { - "description": "The URL to check the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - }, - "schema": { - "$ref": "#/definitions/Status" - } - }, - "200": { - "description": "Request processing completed.", - "schema": { - "$ref": "#/definitions/StatusWithLocation" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, "/{scope}/providers/Microsoft.CostManagement/exports": { "get": { "tags": [ diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index 678371e38c2d..bbbc9c7ab98a 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json index 7940fdab0004..4b8bda916950 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json @@ -1,6 +1,6 @@ { "parameters": { - "billingAccountId": "9845612", + "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", "billingProfileId": "CZSFR-SDFXC-DSDF", "startDate": "2020-01-01", "endDate": "2020-01-30", @@ -9,7 +9,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/billingProfiles/billingProfileId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json deleted file mode 100644 index d29b410a0574..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservation.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parameters": { - "reservationOrderId": "dfgtefrg-af6b-41dd-a622-e6f4fc60c3ee", - "reservationId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", - "startDate": "2020-01-01", - "endDate": "2020-01-30", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/reservations/reservationId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", - "Retry-After": "60" - } - } - } - } - \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json deleted file mode 100644 index 7af9d127642c..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByReservationOrder.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "reservationOrderId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", - "startDate": "2020-01-01", - "endDate": "2020-01-30", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/2131654984156?api-version=2019-11-01", - "Retry-After": "60" - } - } - } - } - \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json index 12b3583829b1..3e3294a9d652 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json @@ -7,7 +7,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" }, "body": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json index 1474c29edc37..7713d65f79d1 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json @@ -1,6 +1,6 @@ { "parameters": { - "billingAccountId": "9845612", + "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", "billingProfileId": "CZSFR-SDFXC-DSDF", "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", "api-version": "2019-11-01" @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/billingAccountId/billingProfiles/billingProfileId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" }, "body": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json deleted file mode 100644 index 74b0f2e360ba..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservation.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parameters": { - "reservationOrderId": "dfgtefrg-af6b-41dd-a622-e6f4fc60c3ee", - "reservationId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/reservations/reservationId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } - } -} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json deleted file mode 100644 index f8bcb95ac71f..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByReservationOrder.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "reservationOrderId": "nhytrgds-af6b-52df-a622-e6f4fc60c3ee", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Capacity/reservationorders/reservationOrderId/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/statusId?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } - } -} \ No newline at end of file From b4d22b377f2d3907c31ea17a2e42b94b0b32354a Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Thu, 23 Jul 2020 02:12:07 -0700 Subject: [PATCH 09/29] Build Error fix --- .../stable/2019-11-01/costmanagement.json | 10 +++---- ...ervationDetailsReportByBillingAccount.json | 25 +++++++++-------- ...ervationDetailsReportByBillingProfile.json | 27 +++++++++---------- ...onDetailsReportStatusByBillingProfile.json | 2 +- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 72418125938e..4b9adf8ce0cf 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1150,7 +1150,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { "post": { "tags": [ "ReservedInstances" @@ -1207,7 +1207,7 @@ } } } - }, + }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { "post": { "tags": [ @@ -1263,7 +1263,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/{statusId}": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { "post": { "tags": [ "ReservedInstances" @@ -2867,7 +2867,7 @@ "failed" ], "x-ms-enum": { - "name": "Status", + "name": "StatusType", "modelAsString": true } }, @@ -3464,4 +3464,4 @@ "x-ms-skip-url-encoding": true } } -} +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index bbbc9c7ab98a..d1973f896a06 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -1,17 +1,16 @@ { - "parameters": { - "billingAccountId": "9845612", - "startDate": "2020-01-01", - "endDate": "2020-01-30", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - } + "parameters": { + "billingAccountId": "9845612", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Retry-After": "60" } } } - \ No newline at end of file +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json index 4b8bda916950..9512a4601816 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json @@ -1,18 +1,17 @@ { - "parameters": { - "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", - "billingProfileId": "CZSFR-SDFXC-DSDF", - "startDate": "2020-01-01", - "endDate": "2020-01-30", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - } + "parameters": { + "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", + "billingProfileId": "CZSFR-SDFXC-DSDF", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Retry-After": "60" } } } - \ No newline at end of file +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json index 7713d65f79d1..22c0f0fd3e04 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" }, "body": { From 2e087db350622fb675c6f2c48e2c068c28c6d5e2 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Thu, 23 Jul 2020 03:22:44 -0700 Subject: [PATCH 10/29] Fix --- .../stable/2019-11-01/costmanagement.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 4b9adf8ce0cf..c4a1eeb1428a 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1151,7 +1151,7 @@ } }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { - "post": { + "get": { "tags": [ "ReservedInstances" ], @@ -1264,7 +1264,7 @@ } }, "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { - "post": { + "get": { "tags": [ "ReservedInstances" ], From 99c4db2a1217397b4bcc8cb8414c2866f96c9b81 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Thu, 23 Jul 2020 03:48:58 -0700 Subject: [PATCH 11/29] Prettified --- .../stable/2019-11-01/costmanagement.json | 2 +- ...ervationDetailsReportByBillingAccount.json | 2 +- ...ervationDetailsReportByBillingProfile.json | 2 +- ...onDetailsReportStatusByBillingAccount.json | 42 +++++++++--------- ...onDetailsReportStatusByBillingProfile.json | 44 +++++++++---------- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index c4a1eeb1428a..7170e3ddb115 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -3464,4 +3464,4 @@ "x-ms-skip-url-encoding": true } } -} \ No newline at end of file +} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index d1973f896a06..7d93cff55986 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json index 9512a4601816..55607890fe08 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json index 3e3294a9d652..7fc2854c3261 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json @@ -1,24 +1,24 @@ { - "parameters": { - "billingAccountId": "9845612", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" + "parameters": { + "billingAccountId": "9845612", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": { + "status": "running" + } }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } } -} \ No newline at end of file + } +} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json index 22c0f0fd3e04..a2240e4938d5 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json @@ -1,25 +1,25 @@ { - "parameters": { - "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", - "billingProfileId": "CZSFR-SDFXC-DSDF", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" + "parameters": { + "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", + "billingProfileId": "CZSFR-SDFXC-DSDF", + "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Retry-After": "60" + }, + "body": { + "status": "running" + } }, - "responses": { - "202": { - "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } + "200": { + "body": { + "status": "succeeded", + "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } } -} \ No newline at end of file + } +} From c3b04c4f8685fbdfaca5da7f0359825f2f344c4f Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 02:39:18 -0700 Subject: [PATCH 12/29] Addressed review comments --- .../stable/2019-11-01/costmanagement.json | 14 ++++++++------ ...etReservationDetailsReportByBillingAccount.json | 2 +- ...etReservationDetailsReportByBillingProfile.json | 2 +- ...rvationDetailsReportStatusByBillingAccount.json | 2 +- ...rvationDetailsReportStatusByBillingProfile.json | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 7170e3ddb115..03c11437d72f 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1113,6 +1113,7 @@ "$ref": "./examples/GetReservationDetailsReportByBillingAccount.json" } }, + "x-ms-long-running-operation": true, "parameters": [ { "$ref": "#/parameters/enrollmentIdParameter" @@ -1129,9 +1130,9 @@ ], "responses": { "202": { - "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", + "description": "Accepted. Request will be processed. Use the Location header to check the status.", "headers": { - "Operation-Location": { + "Location": { "description": "The URL to check the status of the asynchronous operation.", "type": "string" }, @@ -1180,7 +1181,7 @@ "202": { "description": "Request is still processing.", "headers": { - "Operation-Location": { + "Location": { "description": "The URL to check the status of the asynchronous operation.", "type": "string" }, @@ -1223,6 +1224,7 @@ "$ref": "./examples/GetReservationDetailsReportByBillingProfile.json" } }, + "x-ms-long-running-operation": true, "parameters": [ { "$ref": "#/parameters/billingAccountIdParameter" @@ -1242,9 +1244,9 @@ ], "responses": { "202": { - "description": "Accepted. Request will be processed. Use the Operation-Location header to check the status.", + "description": "Accepted. Request will be processed. Use the Location header to check the status.", "headers": { - "Operation-Location": { + "Location": { "description": "The URL to check the status of the asynchronous operation.", "type": "string" }, @@ -1296,7 +1298,7 @@ "202": { "description": "Ok.", "headers": { - "Operation-Location": { + "Location": { "description": "Request is still processing.", "type": "string" }, diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json index 7d93cff55986..6d05cd5123cb 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json index 55607890fe08..cb7409f5160c 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json @@ -9,7 +9,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json index 7fc2854c3261..2ff2de8dd2a6 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json @@ -7,7 +7,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" }, "body": { diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json index a2240e4938d5..50884a0526cc 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Operation-Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" }, "body": { From 3ef0c4c84c6062e0f4293da972b73b86e5ffda99 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 13:20:55 -0700 Subject: [PATCH 13/29] Review changes --- .../stable/2019-11-01/costmanagement.json | 143 +----------------- ...onDetailsReportStatusByBillingAccount.json | 24 --- ...onDetailsReportStatusByBillingProfile.json | 25 --- 3 files changed, 6 insertions(+), 186 deletions(-) delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 03c11437d72f..dfc55a068f9e 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1098,13 +1098,13 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/generateReservationDetailsReport": { "post": { "tags": [ "ReservedInstances" ], - "operationId": "GetReservationDetailsReport_ByBillingAccountId", - "description": "Lists the reservations details for provided date range asynchronously based on enrollment id.", + "operationId": "GenerateReservationDetailsReport_ByBillingAccountId", + "description": "Generates the reservations details report for provided date range asynchronously based on enrollment id.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1142,58 +1142,6 @@ } } }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { - "get": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReportStatus_ByBillingAccountId", - "description": "Get the reservations details report availability status by enrollment id.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "getReservationDetailsReportStatus": { - "$ref": "./examples/GetReservationDetailsReportStatusByBillingAccount.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/enrollmentIdParameter" - }, - { - "$ref": "#/parameters/statusIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Request is still processing.", - "headers": { - "Location": { - "description": "The URL to check the status of the asynchronous operation.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - }, - "schema": { - "$ref": "#/definitions/Status" - } - }, "200": { "description": "Request processing completed.", "schema": { @@ -1209,13 +1157,13 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/generateReservationDetailsReport": { "post": { "tags": [ "ReservedInstances" ], - "operationId": "GetReservationDetailsReport_ByBillingProfileId", - "description": "Lists the reservations details for provided date range asynchronously by billing profile.", + "operationId": "GenerateReservationDetailsReport_ByBillingProfileId", + "description": "Generates the reservations details report for provided date range asynchronously by billing profile.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1256,61 +1204,6 @@ } } }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}/providers/Microsoft.CostManagement/getReservationDetailsReport/status/{statusId}": { - "get": { - "tags": [ - "ReservedInstances" - ], - "operationId": "GetReservationDetailsReportStatus_ByBillingProfileId", - "description": "Get the reservations details report availability status by billing profile.", - "externalDocs": { - "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" - }, - "x-ms-examples": { - "getReservationDetailsReportStatus": { - "$ref": "./examples/GetReservationDetailsReportStatusByBillingProfile.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/billingAccountIdParameter" - }, - { - "$ref": "#/parameters/billingProfileIdParameter" - }, - { - "$ref": "#/parameters/statusIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Ok.", - "headers": { - "Location": { - "description": "Request is still processing.", - "type": "string" - }, - "Retry-After": { - "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", - "type": "string" - } - }, - "schema": { - "$ref": "#/definitions/Status" - } - }, "200": { "description": "Request processing completed.", "schema": { @@ -3352,14 +3245,6 @@ "type": "string", "x-ms-parameter-location": "method" }, - "statusIdParameter": { - "name": "statusId", - "description": "Status id for an operation requested.", - "in": "path", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, "enrollmentIdParameter": { "name": "billingAccountId", "in": "path", @@ -3384,22 +3269,6 @@ "type": "string", "x-ms-parameter-location": "method" }, - "reservationIdParameter": { - "name": "reservationId", - "in": "path", - "description": "Reservation ID", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, - "reservationOrderIdParameter": { - "name": "reservationOrderId", - "in": "path", - "description": "Reservation Order ID", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - }, "managementGroupIdParameter": { "name": "managementGroupId", "in": "path", diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json deleted file mode 100644 index 2ff2de8dd2a6..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingAccount.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "billingAccountId": "9845612", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/Status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } - } -} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json deleted file mode 100644 index 50884a0526cc..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportStatusByBillingProfile.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parameters": { - "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", - "billingProfileId": "CZSFR-SDFXC-DSDF", - "statusId": "cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - }, - "body": { - "status": "running" - } - }, - "200": { - "body": { - "status": "succeeded", - "resourceLocation": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" - } - } - } -} From 3f50733ddad13a9d2a32f029f0fe4655e5973f82 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 13:51:52 -0700 Subject: [PATCH 14/29] Review comments --- .../stable/2019-11-01/costmanagement.json | 4 ++-- ...ervationDetailsReportByBillingAccount.json | 22 +++++++++++++++++++ ...rvationDetailsReportByBillingProfile.json} | 8 ++++++- ...ervationDetailsReportByBillingAccount.json | 16 -------------- 4 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json rename specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/{GetReservationDetailsReportByBillingProfile.json => GenerateReservationDetailsReportByBillingProfile.json} (57%) delete mode 100644 specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index dfc55a068f9e..dd3a6f7ac21e 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1110,7 +1110,7 @@ }, "x-ms-examples": { "ReservationDetails": { - "$ref": "./examples/GetReservationDetailsReportByBillingAccount.json" + "$ref": "./examples/GenerateReservationDetailsReportByBillingAccount.json" } }, "x-ms-long-running-operation": true, @@ -1169,7 +1169,7 @@ }, "x-ms-examples": { "ReservationDetails": { - "$ref": "./examples/GetReservationDetailsReportByBillingProfile.json" + "$ref": "./examples/GenerateReservationDetailsReportByBillingProfile.json" } }, "x-ms-long-running-operation": true, diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json new file mode 100644 index 000000000000..8216efbcd776 --- /dev/null +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "billingAccountId": "9845612", + "startDate": "2020-01-01", + "endDate": "2020-01-30", + "api-version": "2019-11-01" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Retry-After": "60" + } + }, + "200": { + "body": { + "status": "succeeded", + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } + } + } +} diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json similarity index 57% rename from specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json rename to specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index cb7409f5160c..be5cd3d13130 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -9,9 +9,15 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } + }, + "200": { + "body": { + "status": "succeeded", + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } } } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json deleted file mode 100644 index 6d05cd5123cb..000000000000 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GetReservationDetailsReportByBillingAccount.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "billingAccountId": "9845612", - "startDate": "2020-01-01", - "endDate": "2020-01-30", - "api-version": "2019-11-01" - }, - "responses": { - "202": { - "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/getReservationDetailsReport/status/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", - "Retry-After": "60" - } - } - } -} From d6fb1cbbd6c5abb2fd81c81cdf3410b4b085dec3 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 14:01:44 -0700 Subject: [PATCH 15/29] Model changes --- .../GenerateReservationDetailsReportByBillingAccount.json | 4 +++- .../GenerateReservationDetailsReportByBillingProfile.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json index 8216efbcd776..6074f083dc81 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -15,7 +15,9 @@ "200": { "body": { "status": "succeeded", - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + "properties": { + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } } } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index be5cd3d13130..2403829a86ad 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -16,7 +16,9 @@ "200": { "body": { "status": "succeeded", - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + "properties": { + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + } } } } From 7c1017f43d0331c19ed8840b323a6f61d491a948 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 14:23:22 -0700 Subject: [PATCH 16/29] Review comments --- .../stable/2019-11-01/costmanagement.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index dd3a6f7ac21e..3c92e2a01eaa 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1145,7 +1145,7 @@ "200": { "description": "Request processing completed.", "schema": { - "$ref": "#/definitions/StatusWithLocation" + "$ref": "#/definitions/OperationStatus" } }, "default": { @@ -1207,7 +1207,7 @@ "200": { "description": "Request processing completed.", "schema": { - "$ref": "#/definitions/StatusWithLocation" + "$ref": "#/definitions/OperationStatus" } }, "default": { @@ -2750,24 +2750,24 @@ } } }, - "StatusWithLocation": { + "OperationStatus": { "description": "The status of the long running operation.", "properties": { "status": { "description": "The status of the long running operation.", - "type": "string", - "enum": [ - "running", - "succeeded", - "failed" - ], - "x-ms-enum": { - "name": "StatusType", - "modelAsString": true - } + "$ref": "#/definitions/Status" }, - "resourceLocation": { - "description": "A location url of the resource generated.", + "properties": { + "description": "The properties of the resource generated.", + "$ref": "#/definitions/ReportURL" + } + } + }, + "ReportURL": { + "description": "The URL to download the generated report.", + "properties": { + "reportURL": { + "description": "The URL to download the generated report.", "type": "string" } } From 47da478cd7ebb9ac976785521a171f74aad8e376 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 15:07:48 -0700 Subject: [PATCH 17/29] Build error fix --- .../stable/2019-11-01/costmanagement.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 3c92e2a01eaa..50c479351bd9 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1114,6 +1114,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, "parameters": [ { "$ref": "#/parameters/enrollmentIdParameter" @@ -1173,6 +1176,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, "parameters": [ { "$ref": "#/parameters/billingAccountIdParameter" From 4b7100eaf0ef168d5aef3de399074803fe154533 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 15:35:11 -0700 Subject: [PATCH 18/29] Build fix --- .../stable/2019-11-01/costmanagement.json | 6 +++--- .../GenerateReservationDetailsReportByBillingAccount.json | 2 +- .../GenerateReservationDetailsReportByBillingProfile.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 50c479351bd9..bc8c67204a85 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2745,9 +2745,9 @@ "description": "The status of the long running operation.", "type": "string", "enum": [ - "running", - "succeeded", - "failed" + "Running", + "Succeeded", + "Failed" ], "x-ms-enum": { "name": "StatusType", diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json index 6074f083dc81..af59409e0c72 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -14,7 +14,7 @@ }, "200": { "body": { - "status": "succeeded", + "status": "Succeeded", "properties": { "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index 2403829a86ad..703f6628f238 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -15,7 +15,7 @@ }, "200": { "body": { - "status": "succeeded", + "status": "Succeeded", "properties": { "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" } From 5cf87979d02c139b5a2a1cf55131e47ef8cb9893 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 15:56:39 -0700 Subject: [PATCH 19/29] Build fix --- .../stable/2019-11-01/costmanagement.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index bc8c67204a85..6936325c686a 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2763,9 +2763,9 @@ "description": "The status of the long running operation.", "$ref": "#/definitions/Status" }, - "properties": { - "description": "The properties of the resource generated.", - "$ref": "#/definitions/ReportURL" + "reportURL": { + "description": "The URL to download the generated report.", + "type": "string" } } }, From 90ee2afe1fba8c858f6fd391a1e405b8be6ddfd9 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 16:10:59 -0700 Subject: [PATCH 20/29] Build fix --- .../stable/2019-11-01/costmanagement.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 6936325c686a..f4823c9a4694 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2763,9 +2763,10 @@ "description": "The status of the long running operation.", "$ref": "#/definitions/Status" }, - "reportURL": { - "description": "The URL to download the generated report.", - "type": "string" + "properties": { + "x-ms-client-flatten": true, + "description": "The properties of the resource generated.", + "$ref": "#/definitions/ReportURL" } } }, From 38d820e1811ccaff76ca7df8d392c993fb427ee6 Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Fri, 24 Jul 2020 16:22:44 -0700 Subject: [PATCH 21/29] Build fix --- .../stable/2019-11-01/costmanagement.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index f4823c9a4694..dc48107a71d1 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2765,6 +2765,7 @@ }, "properties": { "x-ms-client-flatten": true, + "type": "object", "description": "The properties of the resource generated.", "$ref": "#/definitions/ReportURL" } From 68928fc8d30f5c31a65eedacf3c5d014c67072ce Mon Sep 17 00:00:00 2001 From: Theertharaj Ramu Date: Mon, 27 Jul 2020 15:32:23 -0700 Subject: [PATCH 22/29] build fix --- .../stable/2019-11-01/costmanagement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index dc48107a71d1..9d74b6ad9290 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2774,7 +2774,7 @@ "ReportURL": { "description": "The URL to download the generated report.", "properties": { - "reportURL": { + "reportUrl": { "description": "The URL to download the generated report.", "type": "string" } From 5b8b15077f4fc19c34cdc28ada733a78eb4f670f Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Tue, 6 Oct 2020 18:29:26 -0700 Subject: [PATCH 23/29] Update examples for current implementation --- .../stable/2019-11-01/costmanagement.json | 6 +++++- ...GenerateReservationDetailsReportByBillingAccount.json | 5 +++-- ...GenerateReservationDetailsReportByBillingProfile.json | 9 +++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 9d74b6ad9290..9da7b1eb63a5 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2746,7 +2746,7 @@ "type": "string", "enum": [ "Running", - "Succeeded", + "Completed", "Failed" ], "x-ms-enum": { @@ -2777,6 +2777,10 @@ "reportUrl": { "description": "The URL to download the generated report.", "type": "string" + }, + "validuntil": { + "description": "The time at which report URL becomes invalid.", + "type": "date-time" } } }, diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json index af59409e0c72..217775906134 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -14,9 +14,10 @@ }, "200": { "body": { - "status": "Succeeded", + "status": "Completed", "properties": { - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", + "validUntil": "2020-09-12T02:56:55.5021869Z" } } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index 703f6628f238..2fea99423a02 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -1,6 +1,6 @@ { "parameters": { - "billingAccountId": "e1586352-af6b-41dd-a622-e6f4fc60c3ee", + "billingAccountId": "00000000-0000-0000-0000-000000000000", "billingProfileId": "CZSFR-SDFXC-DSDF", "startDate": "2020-01-01", "endDate": "2020-01-30", @@ -9,15 +9,16 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/e1586352-af6b-41dd-a622-e6f4fc60c3ee/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } }, "200": { "body": { - "status": "Succeeded", + "status": "Completed", "properties": { - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200713/887f83e2-ae6d-1256-804d-18a9be5295ea?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ" + "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", + "validUntil": "2020-09-12T02:56:55.5021869Z" } } } From 580428d04cb32c7b460952fa5c2bae7e15401495 Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Wed, 7 Oct 2020 15:09:19 -0700 Subject: [PATCH 24/29] Update url --- .../GenerateReservationDetailsReportByBillingAccount.json | 2 +- .../GenerateReservationDetailsReportByBillingProfile.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json index 217775906134..b0503f913ff3 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -16,7 +16,7 @@ "body": { "status": "Completed", "properties": { - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", + "reportUrl": "https://storage.blob.core.windows.net/details/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", "validUntil": "2020-09-12T02:56:55.5021869Z" } } diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index 2fea99423a02..1f33d6ebc1ab 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -17,7 +17,7 @@ "body": { "status": "Completed", "properties": { - "reportUrl": "https://ccmintstorage2.blob.core.windows.net/riusagereport/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", + "reportUrl": "https://storage.blob.core.windows.net/details/20200911/00000000-0000-0000-0000-000000000000?sv=2016-05-31&sr=b&sig=jep8HT2aphfUkyERRZa5LRfd9RPzjXbzB%2F9TNiQ", "validUntil": "2020-09-12T02:56:55.5021869Z" } } From f9c1278b0a1c22ee8f3d9dfbfcd8a51077be4129 Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Fri, 16 Oct 2020 04:11:29 -0700 Subject: [PATCH 25/29] Fix semantic errors --- .../stable/2019-11-01/costmanagement.json | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 50d498b0f7cd..0b8386561304 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1132,6 +1132,12 @@ } ], "responses": { + "200": { + "description": "Request processing completed.", + "schema": { + "$ref": "#/definitions/OperationStatus" + } + }, "202": { "description": "Accepted. Request will be processed. Use the Location header to check the status.", "headers": { @@ -1145,12 +1151,6 @@ } } }, - "200": { - "description": "Request processing completed.", - "schema": { - "$ref": "#/definitions/OperationStatus" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1197,6 +1197,12 @@ } ], "responses": { + "200": { + "description": "Request processing completed.", + "schema": { + "$ref": "#/definitions/OperationStatus" + } + }, "202": { "description": "Accepted. Request will be processed. Use the Location header to check the status.", "headers": { @@ -1210,12 +1216,6 @@ } } }, - "200": { - "description": "Request processing completed.", - "schema": { - "$ref": "#/definitions/OperationStatus" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -2436,7 +2436,8 @@ }, "validuntil": { "description": "The time at which report URL becomes invalid.", - "type": "date-time" + "type": "string", + "format": "date-time" } } }, From 5bfc952ea63e25a5e4fcbe08a7c2977dd92326fb Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Fri, 16 Oct 2020 04:21:24 -0700 Subject: [PATCH 26/29] Model validation fix --- .../stable/2019-11-01/costmanagement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 0b8386561304..260c4c56ce3f 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -2434,7 +2434,7 @@ "description": "The URL to download the generated report.", "type": "string" }, - "validuntil": { + "validUntil": { "description": "The time at which report URL becomes invalid.", "type": "string", "format": "date-time" From 8450ceec4581e378e0c9551de1fd6e15d96cb537 Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Fri, 16 Oct 2020 18:51:28 -0700 Subject: [PATCH 27/29] Fix location headers --- .../GenerateReservationDetailsReportByBillingAccount.json | 2 +- .../GenerateReservationDetailsReportByBillingProfile.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json index b0503f913ff3..d8c8f0f40faf 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingAccount.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/9845612/providers/Microsoft.CostManagement/reservationDetailsOperationResults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } }, diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json index 1f33d6ebc1ab..a4bd203ef284 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/examples/GenerateReservationDetailsReportByBillingProfile.json @@ -9,7 +9,7 @@ "responses": { "202": { "headers": { - "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/generateReservationDetailsReport/operationresults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", + "Location": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000/billingProfiles/CZSFR-SDFXC-DSDF/providers/Microsoft.CostManagement/reservationDetailsOperationResults/cf9f95c9-af6b-41dd-a622-e6f4fc60c3ee?api-version=2019-11-01", "Retry-After": "60" } }, From 2b673a45b967516ca5f1e9196cd463f7cb117cb6 Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Mon, 19 Oct 2020 11:02:18 -0700 Subject: [PATCH 28/29] Small style fix --- .../stable/2019-11-01/costmanagement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 260c4c56ce3f..4d8e71e8fd6b 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1139,7 +1139,7 @@ } }, "202": { - "description": "Accepted. Request will be processed. Use the Location header to check the status.", + "description": "Accepted. Request will be processed. Use the location header to check the status.", "headers": { "Location": { "description": "The URL to check the status of the asynchronous operation.", From b023f6d4f11866e5ca86d64ebf15d4379b4f4f68 Mon Sep 17 00:00:00 2001 From: Zach Rathbun Date: Sat, 24 Oct 2020 16:27:33 -0700 Subject: [PATCH 29/29] Fix Lint issues --- .../stable/2019-11-01/costmanagement.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json index 4d8e71e8fd6b..e7a9d2b5817e 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json @@ -1147,6 +1147,7 @@ }, "Retry-After": { "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "format": "int32", "type": "integer" } } @@ -1212,6 +1213,7 @@ }, "Retry-After": { "description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.", + "format": "int32", "type": "integer" } } @@ -2406,7 +2408,7 @@ "Failed" ], "x-ms-enum": { - "name": "StatusType", + "name": "OperationStatusType", "modelAsString": true } }