Skip to content

Commit 7d98899

Browse files
gaoyp830gaoyp830
authored
Minor fix on billingBeneifts (#21566)
* Minor fix on billingBeneifts * Update billingbenefits.json * Update billingbenefits.json * Update billingbenefits.json * Update billingbenefits.json * Update billingbenefits.json * fix examples * Update billingbenefits.json
1 parent be6cd9c commit 7d98899

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

‎specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/billingbenefits.json‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@
7373
},
7474
"/providers/Microsoft.BillingBenefits/savingsPlanOrderAliases/{savingsPlanOrderAliasName}": {
7575
"put": {
76-
"description": "Create a savings plan.",
76+
"description": "Create a savings plan. Learn more about permissions needed at https://go.microsoft.com/fwlink/?linkid=2215851",
7777
"operationId": "SavingsPlanOrderAlias_Create",
78+
"externalDocs": {
79+
"url": "https://go.microsoft.com/fwlink/?linkid=2215851/"
80+
},
7881
"tags": [
7982
"Savings plan order aliases"
8083
],
@@ -285,7 +288,7 @@
285288
"/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans": {
286289
"get": {
287290
"description": "List savings plans in an order.",
288-
"operationId": "SavingsPlansInOrder_List",
291+
"operationId": "SavingsPlan_List",
289292
"tags": [
290293
"Savings plan"
291294
],
@@ -324,7 +327,7 @@
324327
"/providers/Microsoft.BillingBenefits/savingsPlans": {
325328
"get": {
326329
"description": "List savings plans.",
327-
"operationId": "SavingsPlans_List",
330+
"operationId": "SavingsPlan_ListAll",
328331
"tags": [
329332
"Savings plan"
330333
],
@@ -499,7 +502,7 @@
499502
"/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans/{savingsPlanId}/validate": {
500503
"post": {
501504
"description": "Validate savings plan patch.",
502-
"operationId": "SavingsPlanUpdate_Validate",
505+
"operationId": "SavingsPlan_ValidateUpdate",
503506
"tags": [
504507
"Savings plan"
505508
],
@@ -541,7 +544,7 @@
541544
"/providers/Microsoft.BillingBenefits/validate": {
542545
"post": {
543546
"description": "Validate savings plan purchase.",
544-
"operationId": "SavingsPlanPurchase_Validate",
547+
"operationId": "ValidatePurchase",
545548
"tags": [
546549
"Savings plan"
547550
],
@@ -727,7 +730,7 @@
727730
"$ref": "#/definitions/BillingScopeId"
728731
},
729732
"term": {
730-
"$ref": "#/definitions/BenefitTerm"
733+
"$ref": "#/definitions/Term"
731734
},
732735
"billingPlan": {
733736
"$ref": "#/definitions/BillingPlan"
@@ -745,7 +748,7 @@
745748
},
746749
"BillingScopeId": {
747750
"type": "string",
748-
"description": "Subscription that will be charged for purchasing SavingsPlan"
751+
"description": "Subscription that will be charged for purchasing the benefit"
749752
},
750753
"BillingProfileId": {
751754
"type": "string",
@@ -766,7 +769,6 @@
766769
"type": "string",
767770
"description": "The type of the resource that is being reserved.",
768771
"enum": [
769-
"ComputeSavingsPlan",
770772
"VirtualMachines",
771773
"SqlDatabases",
772774
"SuseLinux",
@@ -829,15 +831,16 @@
829831
"modelAsString": true
830832
}
831833
},
832-
"BenefitTerm": {
834+
"Term": {
833835
"type": "string",
834-
"description": "Represent SavingsPlan term in ISO 8601 format.",
836+
"description": "Represent benefit term in ISO 8601 format.",
835837
"enum": [
836838
"P1Y",
837-
"P3Y"
839+
"P3Y",
840+
"P5Y"
838841
],
839842
"x-ms-enum": {
840-
"name": "SavingsPlanTerm",
843+
"name": "Term",
841844
"modelAsString": true
842845
}
843846
},
@@ -882,7 +885,7 @@
882885
},
883886
"TenantId": {
884887
"type": "string",
885-
"description": "Tenant ID where the savings plan should apply benefit."
888+
"description": "Tenant ID where the benefit is applied."
886889
},
887890
"ManagementGroupId": {
888891
"type": "string",
@@ -899,7 +902,7 @@
899902
"Renew": {
900903
"type": "boolean",
901904
"default": false,
902-
"description": "Setting this to true will automatically purchase a new savings plan on the expiration date time."
905+
"description": "Setting this to true will automatically purchase a new benefit on the expiration date time."
903906
},
904907
"Commitment": {
905908
"type": "object",
@@ -1091,7 +1094,7 @@
10911094
"$ref": "#/definitions/BillingAccountId"
10921095
},
10931096
"term": {
1094-
"$ref": "#/definitions/BenefitTerm"
1097+
"$ref": "#/definitions/Term"
10951098
},
10961099
"billingPlan": {
10971100
"$ref": "#/definitions/BillingPlan"
@@ -1202,7 +1205,7 @@
12021205
"$ref": "#/definitions/BillingAccountId"
12031206
},
12041207
"term": {
1205-
"$ref": "#/definitions/BenefitTerm"
1208+
"$ref": "#/definitions/Term"
12061209
},
12071210
"billingPlan": {
12081211
"$ref": "#/definitions/BillingPlan"
@@ -1481,7 +1484,7 @@
14811484
"$ref": "#/definitions/BillingScopeId"
14821485
},
14831486
"term": {
1484-
"$ref": "#/definitions/BenefitTerm"
1487+
"$ref": "#/definitions/Term"
14851488
},
14861489
"billingPlan": {
14871490
"$ref": "#/definitions/BillingPlan"
@@ -1636,7 +1639,7 @@
16361639
"$ref": "#/definitions/BillingScopeId"
16371640
},
16381641
"term": {
1639-
"$ref": "#/definitions/BenefitTerm"
1642+
"$ref": "#/definitions/Term"
16401643
},
16411644
"billingPlan": {
16421645
"$ref": "#/definitions/BillingPlan"
@@ -1723,7 +1726,7 @@
17231726
"$ref": "#/definitions/BillingScopeId"
17241727
},
17251728
"term": {
1726-
"$ref": "#/definitions/BenefitTerm"
1729+
"$ref": "#/definitions/Term"
17271730
},
17281731
"billingPlan": {
17291732
"$ref": "#/definitions/BillingPlan"
@@ -1764,7 +1767,7 @@
17641767
},
17651768
"InstanceFlexibility": {
17661769
"type": "string",
1767-
"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.",
1770+
"description": "Turning this on will apply the reservation discount to other VMs in the same VM size group.",
17681771
"enum": [
17691772
"On",
17701773
"Off"

‎specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasCreate.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"sku": {
77
"name": "Standard_M64s_v2"
88
},
9+
"location": "eastus",
910
"properties": {
1011
"displayName": "ReservationOrder_2022-06-02",
1112
"reservedResourceType": "VirtualMachines",
@@ -37,6 +38,7 @@
3738
"sku": {
3839
"name": "Standard_M64s_v2"
3940
},
41+
"location": "eastus",
4042
"properties": {
4143
"displayName": "ReservationOrder_2022-06-02",
4244
"reservationOrderId": "/providers/Microsoft.Capacity/reservationOrders/30000000-0000-0000-0000-000000000000",

‎specification/billingbenefits/resource-manager/Microsoft.BillingBenefits/stable/2022-11-01/examples/ReservationOrderAliasGet.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"sku": {
1313
"name": "Standard_M64s_v2"
1414
},
15+
"location": "eastus",
1516
"properties": {
1617
"displayName": "ReservationOrder_2022-06-02",
1718
"reservationOrderId": "/providers/Microsoft.Capacity/reservationOrders/30000000-0000-0000-0000-000000000000",

0 commit comments

Comments
 (0)