From 9f2221a0299b45631773204fc359e0fab4a75e5d Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Tue, 15 Nov 2022 15:24:42 -0800 Subject: [PATCH 1/8] Minor fix on billingBeneifts --- .../stable/2022-11-01/billingbenefits.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 3f58feedea0b..5e69bf4f2414 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -727,7 +727,7 @@ "$ref": "#/definitions/BillingScopeId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" @@ -745,7 +745,7 @@ }, "BillingScopeId": { "type": "string", - "description": "Subscription that will be charged for purchasing SavingsPlan" + "description": "Subscription that will be charged for purchasing the benefit" }, "BillingProfileId": { "type": "string", @@ -766,7 +766,6 @@ "type": "string", "description": "The type of the resource that is being reserved.", "enum": [ - "ComputeSavingsPlan", "VirtualMachines", "SqlDatabases", "SuseLinux", @@ -829,15 +828,16 @@ "modelAsString": true } }, - "BenefitTerm": { + "Term": { "type": "string", - "description": "Represent SavingsPlan term in ISO 8601 format.", + "description": "Represent benefit term in ISO 8601 format.", "enum": [ "P1Y", - "P3Y" + "P3Y", + "P5Y" ], "x-ms-enum": { - "name": "SavingsPlanTerm", + "name": "Term", "modelAsString": true } }, @@ -882,7 +882,7 @@ }, "TenantId": { "type": "string", - "description": "Tenant ID where the savings plan should apply benefit." + "description": "Tenant ID where the benefit is applied." }, "ManagementGroupId": { "type": "string", @@ -899,7 +899,7 @@ "Renew": { "type": "boolean", "default": false, - "description": "Setting this to true will automatically purchase a new savings plan on the expiration date time." + "description": "Setting this to true will automatically purchase a new benefit on the expiration date time." }, "Commitment": { "type": "object", @@ -1091,7 +1091,7 @@ "$ref": "#/definitions/BillingAccountId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" @@ -1202,7 +1202,7 @@ "$ref": "#/definitions/BillingAccountId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" @@ -1481,7 +1481,7 @@ "$ref": "#/definitions/BillingScopeId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" @@ -1636,7 +1636,7 @@ "$ref": "#/definitions/BillingScopeId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" @@ -1723,7 +1723,7 @@ "$ref": "#/definitions/BillingScopeId" }, "term": { - "$ref": "#/definitions/BenefitTerm" + "$ref": "#/definitions/Term" }, "billingPlan": { "$ref": "#/definitions/BillingPlan" From 0eccd73a1b42573f3511dc6273f2919d897c57fa Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Tue, 15 Nov 2022 16:01:38 -0800 Subject: [PATCH 2/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 5e69bf4f2414..8fbeb8a68387 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -1764,7 +1764,7 @@ }, "InstanceFlexibility": { "type": "string", - "description": "Turning this on will apply the reservation discount to other VMs in the same VM size group. Only specify for VirtualMachines reserved resource type.", + "description": "Turning this on will apply the reservation discount to other VMs in the same VM size group.", "enum": [ "On", "Off" From f02ecf596cb74051e928ed64060b085577e8b881 Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:30:41 -0800 Subject: [PATCH 3/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 8fbeb8a68387..2ddfa16e0584 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -73,8 +73,11 @@ }, "/providers/Microsoft.BillingBenefits/savingsPlanOrderAliases/{savingsPlanOrderAliasName}": { "put": { - "description": "Create a savings plan.", + "description": "Create a savings plan. Savings plan can only be purchased with certain permissions. Learn more about permissions at https://go.microsoft.com/fwlink/?linkid=2215851", "operationId": "SavingsPlanOrderAlias_Create", + "externalDocs": { + "url": "https://go.microsoft.com/fwlink/?linkid=2215851/" + }, "tags": [ "Savings plan order aliases" ], From ff73c44a45bac69e5a020098cd741f5ee9d505df Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:38:22 -0800 Subject: [PATCH 4/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 2ddfa16e0584..d29926efad58 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -73,7 +73,7 @@ }, "/providers/Microsoft.BillingBenefits/savingsPlanOrderAliases/{savingsPlanOrderAliasName}": { "put": { - "description": "Create a savings plan. Savings plan can only be purchased with certain permissions. Learn more about permissions at https://go.microsoft.com/fwlink/?linkid=2215851", + "description": "Create a savings plan. Learn more about permissions needed at https://go.microsoft.com/fwlink/?linkid=2215851", "operationId": "SavingsPlanOrderAlias_Create", "externalDocs": { "url": "https://go.microsoft.com/fwlink/?linkid=2215851/" From f17797adfb4f7c1cd60d173b7952c9021c7dfb3b Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Wed, 16 Nov 2022 14:58:31 -0800 Subject: [PATCH 5/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index d29926efad58..93cc0e40ca0f 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -502,7 +502,7 @@ "/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans/{savingsPlanId}/validate": { "post": { "description": "Validate savings plan patch.", - "operationId": "SavingsPlanUpdate_Validate", + "operationId": "SavingsPlan_ValidateUpdate", "tags": [ "Savings plan" ], @@ -544,7 +544,7 @@ "/providers/Microsoft.BillingBenefits/validate": { "post": { "description": "Validate savings plan purchase.", - "operationId": "SavingsPlanPurchase_Validate", + "operationId": "SavingsPlanOrderAlias_ValidatePurchase", "tags": [ "Savings plan" ], From 6115aa9d7a06ef578ea8274f1fe37ac6c376cd29 Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Thu, 17 Nov 2022 18:38:26 -0800 Subject: [PATCH 6/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 93cc0e40ca0f..3c9f4b0c02cf 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -288,7 +288,7 @@ "/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans": { "get": { "description": "List savings plans in an order.", - "operationId": "SavingsPlansInOrder_List", + "operationId": "SavingsPlans_List", "tags": [ "Savings plan" ], @@ -327,7 +327,7 @@ "/providers/Microsoft.BillingBenefits/savingsPlans": { "get": { "description": "List savings plans.", - "operationId": "SavingsPlans_List", + "operationId": "SavingsPlans_ListAll", "tags": [ "Savings plan" ], @@ -544,7 +544,7 @@ "/providers/Microsoft.BillingBenefits/validate": { "post": { "description": "Validate savings plan purchase.", - "operationId": "SavingsPlanOrderAlias_ValidatePurchase", + "operationId": "ValidatePurchase", "tags": [ "Savings plan" ], From d3510f74d40eaee4e293f795a1c54ca14bc721af Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Thu, 17 Nov 2022 19:02:48 -0800 Subject: [PATCH 7/8] fix examples --- .../stable/2022-11-01/examples/ReservationOrderAliasCreate.json | 2 ++ .../stable/2022-11-01/examples/ReservationOrderAliasGet.json | 1 + 2 files changed, 3 insertions(+) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasCreate.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasCreate.json index b002d3b54b27..be669f04ecfc 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasCreate.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasCreate.json @@ -6,6 +6,7 @@ "sku": { "name": "Standard_M64s_v2" }, + "location": "eastus", "properties": { "displayName": "ReservationOrder_2022-06-02", "reservedResourceType": "VirtualMachines", @@ -37,6 +38,7 @@ "sku": { "name": "Standard_M64s_v2" }, + "location": "eastus", "properties": { "displayName": "ReservationOrder_2022-06-02", "reservationOrderId": "/providers/Microsoft.Capacity/reservationOrders/30000000-0000-0000-0000-000000000000", diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasGet.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasGet.json index 57b028b4efce..3b0862eecbc2 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasGet.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasGet.json @@ -12,6 +12,7 @@ "sku": { "name": "Standard_M64s_v2" }, + "location": "eastus", "properties": { "displayName": "ReservationOrder_2022-06-02", "reservationOrderId": "/providers/Microsoft.Capacity/reservationOrders/30000000-0000-0000-0000-000000000000", From beec0118f220bc0a61d89c628cdbf63e553952b5 Mon Sep 17 00:00:00 2001 From: gaoyp830 <51546332+gaoyp830@users.noreply.github.com> Date: Thu, 17 Nov 2022 19:05:21 -0800 Subject: [PATCH 8/8] Update billingbenefits.json --- .../stable/2022-11-01/billingbenefits.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json index 3c9f4b0c02cf..dfb00b5cfc47 100644 --- a/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json +++ b/specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json @@ -288,7 +288,7 @@ "/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans": { "get": { "description": "List savings plans in an order.", - "operationId": "SavingsPlans_List", + "operationId": "SavingsPlan_List", "tags": [ "Savings plan" ], @@ -327,7 +327,7 @@ "/providers/Microsoft.BillingBenefits/savingsPlans": { "get": { "description": "List savings plans.", - "operationId": "SavingsPlans_ListAll", + "operationId": "SavingsPlan_ListAll", "tags": [ "Savings plan" ],