[Hub Generated] Review request for Microsoft.Consumption to add versi…

…on stable/2021-10-01 (#18174) * Adding details about access and Report Schema for reservation report * MISC * Missing errors * fixing model error * MISC * MISC * MISC * MSIC * MISC * Removing Etag to fix the S360 item * Fixing Routing issue * MISC * MISC * MISC * MISC
Azure · Apr 27, 2022 · 731678a · 731678a
1 parent a5cd8e4
commit 731678a
Show file tree

Hide file tree

Showing 40 changed files with 85 additions and 75 deletions.
diff --git a/...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json b/...ion/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/...Consumption/stable/2019-10-01/examples/ReservationTransactionsListByEnrollmentNumber.json b/...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/...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json b/...ion/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/...icrosoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingAccountId.json b/...icrosoft.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/...icrosoft.Consumption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileId.json b/...icrosoft.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/...umption/stable/2019-11-01/examples/ReservationDetailsByBillingProfileIdReservationId.json b/...umption/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/...sumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingAccount.json b/...sumption/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/...sumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByBillingProfile.json b/...sumption/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/...nsumption/stable/2019-11-01/examples/ReservationRecommendationDetailsByResourceGroup.json b/...nsumption/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/...onsumption/stable/2019-11-01/examples/ReservationRecommendationDetailsBySubscription.json b/...onsumption/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/...ft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingAccount.json b/...ft.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/...ft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json b/...ft.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/...oft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByResourceGroup.json b/...oft.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/...soft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsBySubscription.json b/...soft.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/...-11-01/examples/ReservationRecommendationsFilterBySubscriptionForScopeLookBackPeriod.json b/...-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/...Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingAccountId.json b/...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/...Consumption/stable/2019-11-01/examples/ReservationSummariesDailyWithBillingProfileId.json b/...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/...nsumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json b/...nsumption/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/...nsumption/stable/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileId.json b/...nsumption/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/...ble/2019-11-01/examples/ReservationSummariesMonthlyWithBillingProfileIdReservationId.json b/...ble/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/...Consumption/stable/2019-11-01/examples/ReservationTransactionsListByEnrollmentNumber.json b/...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",