Skip to content

Commit fae3cf2

Browse files
authored
Swagger correctness fixes (#15520)
* Adding 2020-09-Preview same as 11-preview * fixing lint issue * fixing model * fixing model * fixing model * pretify fix * fixing linting * more linting fix * fixing swagger correctness * swagger correctness fixes * fixing errors
1 parent 1e9e2b4 commit fae3cf2

File tree

6 files changed

+37
-2
lines changed

6 files changed

+37
-2
lines changed

specification/billing/resource-manager/Microsoft.Billing/preview/2020-09-01-preview/billingPromotions.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"Promotion, Activate"
4848
],
4949
"responses": {
50-
"200": {
50+
"202": {
5151
"description": "The resource has been created",
5252
"schema": {
5353
"$ref": "#/definitions/PromotionResponse"
@@ -331,6 +331,10 @@
331331
"type": "string",
332332
"description": "Reason in case the subscription is not eligible for promotion."
333333
},
334+
"details": {
335+
"type": "string",
336+
"description": "Details in case the subscription is not eligible for promotion."
337+
},
334338
"eligibilitySubscriptionId": {
335339
"type": "string",
336340
"description": "Subscription Id on which the eligibility check was performed."

specification/billing/resource-manager/Microsoft.Billing/preview/2020-09-01-preview/examples/PromotionActivation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"responses": {
19-
"200": {
19+
"202": {
2020
"body": {
2121
"id": "/providers/Microsoft.Billing/promotions/ff0f1add-122a-43c1-a2ec-c2277781667d",
2222
"type": "Microsoft.Billing/promotions",

specification/billing/resource-manager/Microsoft.Billing/preview/2020-09-01-preview/examples/PromotionCheckEligibility.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"name": "WVD 30 percent off",
1313
"eligible": true,
1414
"reason": "None",
15+
"details": "",
1516
"eligibilitySubscriptionId": "f6dc64c8-34bb-43d3-96b0-fd2b8c94f1c3",
1617
"expiryDate": "2021-10-01"
1718
}

specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/CalculateReservationOrder.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
"currencyCode": "USD",
3030
"amount": 46.0
3131
},
32+
"netTotal": 0,
33+
"taxTotal": 0,
34+
"grandTotal": 0,
3235
"reservationOrderId": "6d9cec54-7de8-abcd-9de7-80f5d634f2d2",
3336
"skuTitle": "Reserved VM Instance, Standard_D1, US West, 1 Year",
3437
"skuDescription": "standard_D1",

specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
2222
],
2323
"renew": false,
24+
"archived": false,
2425
"renewSource": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
2526
"renewDestination": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
2627
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",

specification/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,18 @@
11471147
}
11481148
}
11491149
},
1150+
"netTotal": {
1151+
"description": "Net total",
1152+
"type": "number"
1153+
},
1154+
"taxTotal": {
1155+
"description": "Tax total",
1156+
"type": "number"
1157+
},
1158+
"grandTotal": {
1159+
"description": "Grand Total",
1160+
"type": "number"
1161+
},
11501162
"isBillingPartnerManaged": {
11511163
"description": "True if billing is managed by Microsoft Partner. Used only for CSP accounts.",
11521164
"type": "boolean"
@@ -1260,6 +1272,14 @@
12601272
},
12611273
"term": {
12621274
"$ref": "#/definitions/ReservationTerm"
1275+
},
1276+
"archived": {
1277+
"type": "boolean",
1278+
"description": "Property to determine if a reservation is archived or not"
1279+
},
1280+
"capabilities": {
1281+
"type": "string",
1282+
"description": "List the Capabilities of a reservation"
12631283
}
12641284
}
12651285
},
@@ -1301,6 +1321,9 @@
13011321
"reservedResourceType": {
13021322
"$ref": "#/definitions/ReservedResourceType"
13031323
},
1324+
"instanceFlexibility": {
1325+
"$ref": "#/definitions/InstanceFlexibility"
1326+
},
13041327
"billingScopeId": {
13051328
"$ref": "#/definitions/BillingScopeId"
13061329
},
@@ -1668,6 +1691,9 @@
16681691
},
16691692
"valid": {
16701693
"type": "boolean"
1694+
},
1695+
"reason": {
1696+
"type": "string"
16711697
}
16721698
}
16731699
},

0 commit comments

Comments
 (0)