Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fix on billingBeneifts #21566

Merged
merged 8 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@
},
"/providers/Microsoft.BillingBenefits/savingsPlanOrderAliases/{savingsPlanOrderAliasName}": {
"put": {
"description": "Create a savings plan.",
"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/"
},
"tags": [
"Savings plan order aliases"
],
Expand Down Expand Up @@ -285,7 +288,7 @@
"/providers/Microsoft.BillingBenefits/savingsPlanOrders/{savingsPlanOrderId}/savingsPlans": {
"get": {
"description": "List savings plans in an order.",
"operationId": "SavingsPlansInOrder_List",
"operationId": "SavingsPlan_List",
"tags": [
"Savings plan"
],
Expand Down Expand Up @@ -324,7 +327,7 @@
"/providers/Microsoft.BillingBenefits/savingsPlans": {
"get": {
"description": "List savings plans.",
"operationId": "SavingsPlans_List",
"operationId": "SavingsPlan_ListAll",
"tags": [
"Savings plan"
],
Expand Down Expand Up @@ -499,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"
],
Expand Down Expand Up @@ -541,7 +544,7 @@
"/providers/Microsoft.BillingBenefits/validate": {
"post": {
"description": "Validate savings plan purchase.",
"operationId": "SavingsPlanPurchase_Validate",
"operationId": "ValidatePurchase",
"tags": [
"Savings plan"
],
Expand Down Expand Up @@ -727,7 +730,7 @@
"$ref": "#/definitions/BillingScopeId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand All @@ -745,7 +748,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",
Expand All @@ -766,7 +769,6 @@
"type": "string",
"description": "The type of the resource that is being reserved.",
"enum": [
"ComputeSavingsPlan",
"VirtualMachines",
"SqlDatabases",
"SuseLinux",
Expand Down Expand Up @@ -829,15 +831,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
}
},
Expand Down Expand Up @@ -882,7 +885,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",
Expand All @@ -899,7 +902,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",
Expand Down Expand Up @@ -1091,7 +1094,7 @@
"$ref": "#/definitions/BillingAccountId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand Down Expand Up @@ -1202,7 +1205,7 @@
"$ref": "#/definitions/BillingAccountId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand Down Expand Up @@ -1481,7 +1484,7 @@
"$ref": "#/definitions/BillingScopeId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand Down Expand Up @@ -1636,7 +1639,7 @@
"$ref": "#/definitions/BillingScopeId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand Down Expand Up @@ -1723,7 +1726,7 @@
"$ref": "#/definitions/BillingScopeId"
},
"term": {
"$ref": "#/definitions/BenefitTerm"
"$ref": "#/definitions/Term"
},
"billingPlan": {
"$ref": "#/definitions/BillingPlan"
Expand Down Expand Up @@ -1764,7 +1767,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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"sku": {
"name": "Standard_M64s_v2"
},
"location": "eastus",
"properties": {
"displayName": "ReservationOrder_2022-06-02",
"reservedResourceType": "VirtualMachines",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down