diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json index c6a19e934001..2886ce1dffe6 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json @@ -3013,10 +3013,6 @@ "type": "string", "description": "Resource sku" }, - "eTag": { - "type": "string", - "description": "Resource eTag." - }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/ReservationRecommendationDetailsProperties", @@ -3398,11 +3394,6 @@ "description": "Properties for modern reservation recommendation", "$ref": "#/definitions/ModernReservationRecommendationProperties", "x-ms-client-flatten": true - }, - "eTag": { - "description": "Resource eTag.", - "type": "string", - "readOnly": true } }, "allOf": [ @@ -3628,7 +3619,6 @@ "ModernReservationTransaction": { "description": "Modern Reservation transaction resource.", "type": "object", - "x-ms-discriminator-value": "Modern", "allOf": [ { "$ref": "#/definitions/ReservationTransactionResource" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/examples/ReservationTransactionsListByEnrollmentNumber.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/examples/ReservationTransactionsListByEnrollmentNumber.json index 185bcd6abb8d..4c4d947440b2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/examples/ReservationTransactionsListByEnrollmentNumber.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/examples/ReservationTransactionsListByEnrollmentNumber.json @@ -26,7 +26,7 @@ "armSkuName": "Standard_DS1_v2", "term": "P1Y", "region": "westus", - "purchasingSubscriptionGuid": "11111111-1111-1111-1111-11111111111", + "purchasingSubscriptionGuid": "11111111-1111-1111-1111-111111111111", "purchasingSubscriptionName": "Infrastructure Subscription", "accountName": "Microsoft Infrastructure", "accountOwnerEmail": "admin@microsoft.com", @@ -54,7 +54,7 @@ "armSkuName": "Standard_DS1_v2", "term": "P1Y", "region": "westus", - "purchasingSubscriptionGuid": "11111111-1111-1111-1111-11111111111", + "purchasingSubscriptionGuid": "11111111-1111-1111-1111-111111111111", "purchasingSubscriptionName": "Infrastructure Subscription", "accountName": "Microsoft Infrastructure", "accountOwnerEmail": "admin@microsoft.com", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json index 43d7b5055869..27f7f2c702d1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json @@ -775,7 +775,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationSummaries": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationSummaries": { "get": { "tags": [ "ReservationSummaries" @@ -972,7 +972,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationDetails": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationDetails": { "get": { "tags": [ "ReservationDetails" @@ -1059,7 +1059,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationRecommendations": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationRecommendations": { "get": { "tags": [ "ReservationRecommendations" @@ -1119,7 +1119,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationRecommendationDetails": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationRecommendationDetails": { "get": { "tags": [ "ReservationRecommendationDetails" @@ -3631,7 +3631,6 @@ "ModernReservationTransaction": { "description": "Modern Reservation transaction resource.", "type": "object", - "x-ms-discriminator-value": "Modern", "allOf": [ { "$ref": "#/definitions/ReservationTransactionResource" @@ -5204,7 +5203,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationsSummariesParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5213,7 +5212,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationDetailsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5222,7 +5221,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationRecommendationsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5231,7 +5230,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationRecommendationDetailsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5240,7 +5239,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationTransactionsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingAccountId.json index 94e015eb5412..62bf17e9c395 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileId.json index f8b5484a4e4c..f272d8bf4bc3 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "startDate": "2019-09-01", "endDate": "2019-10-31" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileIdReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileIdReservationId.json index 27625c1e4220..246841472e9b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileIdReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileIdReservationId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "startDate": "2019-09-01", "endDate": "2019-10-31", "reservationId": "1c6b6358-709f-484c-85f1-72e862a0cf3b", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingAccount.json index 5b3cc4f083e2..42042e4f5868 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "billingScope": "providers/Microsoft.Billing/billingAccounts/000000", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/000000", "lookBackPeriod": "Last60Days", "product": "Standard_DS14_v2", "region": "eastus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingProfile.json index c4440afe750d..5ebdaa29ee60 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingProfile.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "billingScope": "providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-00000000:00000000-0000-0000-0000-00000000/billingProfiles/00000000-0000-0000-0000-00000000", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-00000000:00000000-0000-0000-0000-00000000/billingProfiles/00000000-0000-0000-0000-00000000", "lookBackPeriod": "Last7Days", "product": "Standard_B2s", "region": "australiaeast", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByResourceGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByResourceGroup.json index ec52acddcd75..69edbe3809ba 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByResourceGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByResourceGroup.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "billingScope": "subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/testGroup", + "resourceScope": "subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/testGroup", "lookBackPeriod": "Last30Days", "product": "Standard_DS13_v2", "region": "westus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsBySubscription.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsBySubscription.json index 4bfcc0f88688..ae27e46000e5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsBySubscription.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationDetailsBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "billingScope": "subscriptions/00000000-0000-0000-0000-00000000", + "resourceScope": "subscriptions/00000000-0000-0000-0000-00000000", "lookBackPeriod": "Last30Days", "product": "Standard_DS13_v2", "region": "westus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingAccount.json index 9ebf95cc609a..73115bf5b51d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/123456" + "resourceScope": "providers/Microsoft.Billing/billingAccounts/123456" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json index 5ea959ff16d2..44abaf8b64cf 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/123456/billingProfiles/6420" + "resourceScope": "providers/Microsoft.Billing/billingAccounts/123456/billingProfiles/6420" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByResourceGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByResourceGroup.json index e729ec36af46..246d698cfca8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByResourceGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByResourceGroup.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsBySubscription.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsBySubscription.json index a927fafa02ab..f23d35554172 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsBySubscription.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000" + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json index d49263d4ab55..3420355153f4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000", "$filter": "properties/scope eq 'Single' AND properties/lookBackPeriod eq 'Last7Days'" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingAccountId.json index ea0c9f8468b1..06d1d64969e4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "grain": "daily", "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-11-20" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingProfileId.json index e9a81ac3e937..8cae59a860fa 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "daily", "startDate": "2017-10-01", "endDate": "2017-11-20" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json index 15ed13b35db7..6660209f9415 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "grain": "monthly" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json index 124a8ca96e18..fd35daa46d97 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "monthly" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json index ce3699a288fe..95f026dee591 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-11-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "monthly", "reservationId": "1c6b6358-709f-484c-85f1-72e862a0cf3b", "reservationOrderId": "9f39ba10-794f-4dcb-8f4b-8d0cb47c27dc" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationTransactionsListByEnrollmentNumber.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationTransactionsListByEnrollmentNumber.json index d77b90a3887c..32dd537187ad 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationTransactionsListByEnrollmentNumber.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationTransactionsListByEnrollmentNumber.json @@ -26,7 +26,7 @@ "armSkuName": "Standard_DS1_v2", "term": "P1Y", "region": "westus", - "purchasingSubscriptionGuid": "11111111-1111-1111-1111-11111111111", + "purchasingSubscriptionGuid": "11111111-1111-1111-1111-111111111111", "purchasingSubscriptionName": "Infrastructure Subscription", "accountName": "Microsoft Infrastructure", "accountOwnerEmail": "admin@microsoft.com", @@ -54,7 +54,7 @@ "armSkuName": "Standard_DS1_v2", "term": "P1Y", "region": "westus", - "purchasingSubscriptionGuid": "11111111-1111-1111-1111-11111111111", + "purchasingSubscriptionGuid": "11111111-1111-1111-1111-111111111111", "purchasingSubscriptionName": "Infrastructure Subscription", "accountName": "Microsoft Infrastructure", "accountOwnerEmail": "admin@microsoft.com", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json index df96b37f48ce..1cdf77ae6f15 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json @@ -778,7 +778,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationSummaries": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationSummaries": { "get": { "tags": [ "ReservationSummaries" @@ -975,7 +975,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationDetails": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationDetails": { "get": { "tags": [ "ReservationDetails" @@ -1062,7 +1062,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationRecommendations": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationRecommendations": { "get": { "tags": [ "ReservationRecommendations" @@ -1122,7 +1122,7 @@ } } }, - "/{scope}/providers/Microsoft.Consumption/reservationRecommendationDetails": { + "/{resourceScope}/providers/Microsoft.Consumption/reservationRecommendationDetails": { "get": { "tags": [ "ReservationRecommendationDetails" @@ -1153,6 +1153,9 @@ { "$ref": "#/parameters/scopeReservationRecommendationDetailsParameter" }, + { + "$ref": "#/parameters/scopeParameter" + }, { "$ref": "#/parameters/regionParameter" }, @@ -3201,10 +3204,6 @@ "type": "string", "description": "Resource sku" }, - "etag": { - "type": "string", - "description": "Resource etag." - }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/ReservationRecommendationDetailsProperties", @@ -5539,7 +5538,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationsSummariesParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5548,7 +5547,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationDetailsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5557,7 +5556,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationRecommendationsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5566,7 +5565,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationRecommendationDetailsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", @@ -5575,7 +5574,7 @@ "x-ms-skip-url-encoding": true }, "scopeReservationTransactionsParameter": { - "name": "scope", + "name": "resourceScope", "in": "path", "required": true, "type": "string", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingAccountId.json index c431c7d034e8..6581922146e2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-12-05" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileId.json index dc89f0ab8760..d2cd5137488f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "startDate": "2019-09-01", "endDate": "2019-10-31" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileIdReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileIdReservationId.json index 154b042d0c1e..1439763ee31e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileIdReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationDetailsByBillingProfileIdReservationId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "startDate": "2019-09-01", "endDate": "2019-10-31", "reservationId": "1c6b6358-709f-484c-85f1-72e862a0cf3b", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingAccount.json index 6214b09d66b1..efc976523970 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "billingScope": "providers/Microsoft.Billing/billingAccounts/000000", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/000000", "lookBackPeriod": "Last60Days", "product": "Standard_DS14_v2", "region": "eastus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingProfile.json index 6b6b54492382..796c4cad7e91 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByBillingProfile.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "billingScope": "providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-00000000:00000000-0000-0000-0000-00000000/billingProfiles/00000000-0000-0000-0000-00000000", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-00000000:00000000-0000-0000-0000-00000000/billingProfiles/00000000-0000-0000-0000-00000000", "lookBackPeriod": "Last7Days", "product": "Standard_B2s", "region": "australiaeast", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByResourceGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByResourceGroup.json index 98c07f63e6cc..8059ca358651 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByResourceGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsByResourceGroup.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "billingScope": "subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/testGroup", + "resourceScope": "subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/testGroup", "lookBackPeriod": "Last30Days", "product": "Standard_DS13_v2", "region": "westus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsBySubscription.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsBySubscription.json index c6594fd17e26..fe1a4d9429cd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsBySubscription.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationDetailsBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "billingScope": "subscriptions/00000000-0000-0000-0000-00000000", + "resourceScope": "subscriptions/00000000-0000-0000-0000-00000000", "lookBackPeriod": "Last30Days", "product": "Standard_DS13_v2", "region": "westus", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingAccount.json index 299b49911c8b..0b6a590c20d6 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingAccount.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/123456" + "resourceScope": "providers/Microsoft.Billing/billingAccounts/123456" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingProfile.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingProfile.json index 7e4057d3439d..3f259e149568 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingProfile.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByBillingProfile.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/123456/billingProfiles/6420" + "resourceScope": "providers/Microsoft.Billing/billingAccounts/123456/billingProfiles/6420" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json index 1a1c1fb6979e..834a408f21e4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsByResourceGroup.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json index eb4ec8490475..2008e665a5c0 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000" + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json index bbca5db6fd42..ecfc5dc9c145 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "resourceScope": "subscriptions/00000000-0000-0000-0000-000000000000", "$filter": "properties/scope eq 'Single' AND properties/lookBackPeriod eq 'Last7Days'" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingAccountId.json index 477985e88d1d..b2d84d3824bd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "grain": "daily", "$filter": "properties/usageDate ge 2017-10-01 AND properties/usageDate le 2017-11-20" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingProfileId.json index 9b2696c73635..5fea37d67703 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesDailyWithBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "daily", "startDate": "2017-10-01", "endDate": "2017-11-20" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json index ea5e8df55e85..aacb7ee19f86 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345", "grain": "monthly" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json index 6b56c52a7f93..01dccaf65baf 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "monthly" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json index 83fd78fb6dcc..abdb34638957 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2021-10-01", - "scope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/12345:2468/billingProfiles/13579", "grain": "monthly", "reservationId": "1c6b6358-709f-484c-85f1-72e862a0cf3b", "reservationOrderId": "9f39ba10-794f-4dcb-8f4b-8d0cb47c27dc" diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2021-10-01/costmanagement.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2021-10-01/costmanagement.json index 8f938c7d3d3e..9d81cf3b82a4 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2021-10-01/costmanagement.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2021-10-01/costmanagement.json @@ -1115,7 +1115,7 @@ "ReservedInstances" ], "operationId": "GenerateReservationDetailsReport_ByBillingAccountId", - "description": "Generates the reservations details report for provided date range asynchronously based on enrollment id.", + "description": "Generates the reservations details report for provided date range asynchronously based on enrollment id. The Reservation usage details can be viewed only by certain enterprise roles. For more details on the roles see, https://docs.microsoft.com/en-us/azure/cost-management-billing/manage/understand-ea-roles#usage-and-costs-access-by-role", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -1178,7 +1178,7 @@ "ReservedInstances" ], "operationId": "GenerateReservationDetailsReport_ByBillingProfileId", - "description": "Generates the reservations details report for provided date range asynchronously by billing profile.", + "description": "Generates the reservations details report for provided date range asynchronously by billing profile. The Reservation usage details can be viewed by only certain enterprise roles by default. For more details on the roles see, https://docs.microsoft.com/en-us/azure/cost-management-billing/reservations/reservation-utilization#view-utilization-in-the-azure-portal-with-azure-rbac-access", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/" }, @@ -2584,8 +2584,9 @@ "type": "object", "properties": { "reportUrl": { - "description": "The URL to download the generated report.", - "type": "string" + "description": "The CSV file from the reportUrl blob link consists of reservation usage data with the following schema at daily granularity", + "type": "string", + "$ref": "#/definitions/ReservationReportSchema" }, "validUntil": { "description": "The time at which report URL becomes invalid.", @@ -2727,6 +2728,27 @@ "operator", "values" ] + }, + "ReservationReportSchema": { + "description": "The CSV file from the reportUrl blob link consists of reservation usage data with the following schema at daily granularity", + "type": "string", + "enum": [ + "InstanceFlexibilityGroup", + "InstanceFlexibilityRatio", + "InstanceId", + "Kind", + "ReservationId", + "ReservationOrderId", + "ReservedHours", + "SkuName", + "TotalReservedQuantity", + "UsageDate", + "UsedHours" + ], + "x-ms-enum": { + "name": "ReservationReportSchema", + "modelAsString": true + } } }, "parameters": {