Skip to content

Swagger correctness fixes #15520

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Aug 12, 2021
Merged

Swagger correctness fixes #15520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
04ecc20
Adding 2020-09-Preview same as 11-preview
rkapso Jun 25, 2021
bcfcd50
fixing lint issue
rkapso Jun 28, 2021
d4d13d6
fixing model
rkapso Jul 8, 2021
5dd5a0b
fixing model
rkapso Jul 8, 2021
547ae53
fixing model
rkapso Jul 8, 2021
511b61c
pretify fix
rkapso Jul 8, 2021
05b7ffc
fixing linting
rkapso Jul 9, 2021
567b0ee
more linting fix
rkapso Jul 9, 2021
16a23d3
Merge branch 'Azure:master' into master
rkapso Aug 4, 2021
04154e5
fixing swagger correctness
rkapso Aug 4, 2021
6a1839d
swagger correctness fixes
rkapso Aug 4, 2021
9095f01
fixing errors
rkapso Aug 4, 2021
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
6 changes: 5 additions & 1 deletion ...ling/resource-manager/Microsoft.Billing/preview/2020-09-01-preview/billingPromotions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"Promotion, Activate"
],
"responses": {
"200": {
"202": {
"description": "The resource has been created",
"schema": {
"$ref": "#/definitions/PromotionResponse"
Expand Down Expand Up @@ -331,6 +331,10 @@
"type": "string",
"description": "Reason in case the subscription is not eligible for promotion."
},
"details": {
"type": "string",
"description": "Details in case the subscription is not eligible for promotion."
},
"eligibilitySubscriptionId": {
"type": "string",
"description": "Subscription Id on which the eligibility check was performed."
Expand Down
2 changes: 1 addition & 1 deletion ...ce-manager/Microsoft.Billing/preview/2020-09-01-preview/examples/PromotionActivation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
},
"responses": {
"200": {
"202": {
"body": {
"id": "/providers/Microsoft.Billing/promotions/ff0f1add-122a-43c1-a2ec-c2277781667d",
"type": "Microsoft.Billing/promotions",
Expand Down
1 change: 1 addition & 0 deletions ...ager/Microsoft.Billing/preview/2020-09-01-preview/examples/PromotionCheckEligibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"name": "WVD 30 percent off",
"eligible": true,
"reason": "None",
"details": "",
"eligibilitySubscriptionId": "f6dc64c8-34bb-43d3-96b0-fd2b8c94f1c3",
"expiryDate": "2021-10-01"
}
Expand Down
3 changes: 3 additions & 0 deletions ...rce-manager/Microsoft.Capacity/preview/2019-04-01/examples/CalculateReservationOrder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"currencyCode": "USD",
"amount": 46.0
},
"netTotal": 0,
"taxTotal": 0,
"grandTotal": 0,
"reservationOrderId": "6d9cec54-7de8-abcd-9de7-80f5d634f2d2",
"skuTitle": "Reserved VM Instance, Standard_D1, US West, 1 Year",
"skuDescription": "standard_D1",
Expand Down
1 change: 1 addition & 0 deletions ...esource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"archived": false,
"renewSource": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
"renewDestination": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
Expand Down
26 changes: 26 additions & 0 deletions ...ion/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,18 @@
}
}
},
"netTotal": {
"description": "Net total",
"type": "number"
},
"taxTotal": {
"description": "Tax total",
"type": "number"
},
"grandTotal": {
"description": "Grand Total",
"type": "number"
},
"isBillingPartnerManaged": {
"description": "True if billing is managed by Microsoft Partner. Used only for CSP accounts.",
"type": "boolean"
Expand Down Expand Up @@ -1260,6 +1272,14 @@
},
"term": {
"$ref": "#/definitions/ReservationTerm"
},
"archived": {
"type": "boolean",
"description": "Property to determine if a reservation is archived or not"
},
"capabilities": {
"type": "string",
"description": "List the Capabilities of a reservation"
}
}
},
Expand Down Expand Up @@ -1301,6 +1321,9 @@
"reservedResourceType": {
"$ref": "#/definitions/ReservedResourceType"
},
"instanceFlexibility": {
"$ref": "#/definitions/InstanceFlexibility"
},
"billingScopeId": {
"$ref": "#/definitions/BillingScopeId"
},
Expand Down Expand Up @@ -1668,6 +1691,9 @@
},
"valid": {
"type": "boolean"
},
"reason": {
"type": "string"
}
}
},
Expand Down