Skip to content

Commit 01f2d2f

Browse files
gaoyp830gaoyp830
authored
Fixing S360 (#19554)
* Fixing S360 * Adding x-ms-enum
1 parent 45472ea commit 01f2d2f

File tree

9 files changed

+52
-5
lines changed

9 files changed

+52
-5
lines changed

‎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
@@ -33,6 +33,7 @@
3333
"displayName": "cabri_test",
3434
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
3535
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
36+
"benefitStartTime": "2017-09-22T22:46:32.7632798Z",
3637
"reservedResourceType": "VirtualMachines",
3738
"instanceFlexibility": "Off",
3839
"skuDescription": "D1 v2",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"etag": 7,
1313
"properties": {
1414
"displayName": "cabri",
15+
"benefitStartTime": "2017-08-30T03:49:19.0252126Z",
1516
"requestDateTime": "2017-08-30T03:49:19.0252126Z",
1617
"createdDateTime": "2017-08-30T03:51:49.8083758Z",
1718
"expiryDate": "2018-08-30",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"displayName": "cabri",
1616
"requestDateTime": "2019-08-30T03:49:19Z",
1717
"createdDateTime": "2019-08-30T03:51:49Z",
18+
"benefitStartTime": "2019-08-30T03:51:49Z",
1819
"expiryDate": "2018-08-30",
1920
"term": "P1Y",
2021
"billingPlan": "Monthly",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"displayName": "cabri",
1616
"requestDateTime": "2017-08-29T21:20:23.8134834Z",
1717
"createdDateTime": "2017-08-29T21:22:56.8541664Z",
18+
"benefitStartTime": "2017-08-29T21:20:23.8134834Z",
1819
"expiryDate": "2018-08-29",
1920
"term": "P1Y",
2021
"billingPlan": "Monthly",
@@ -36,6 +37,7 @@
3637
"displayName": "cabri",
3738
"requestDateTime": "2017-08-30T12:55:40.2799114Z",
3839
"createdDateTime": "2017-08-30T12:58:20.526Z",
40+
"benefitStartTime": "2017-08-30T12:58:30.526Z",
3941
"expiryDate": "2018-08-30",
4042
"term": "P1Y",
4143
"billingPlan": "Monthly",
@@ -57,6 +59,7 @@
5759
"displayName": "cabri",
5860
"requestDateTime": "2017-08-30T03:49:19.0252126Z",
5961
"createdDateTime": "2017-08-30T03:51:49.8083758Z",
62+
"benefitStartTime": "2017-08-30T03:51:50.8083758Z",
6063
"expiryDate": "2018-08-30",
6164
"term": "P1Y",
6265
"billingPlan": "Monthly",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"billingPlan": "Monthly",
2727
"effectiveDateTime": "2017-09-22T23:57:48.1891638Z",
2828
"lastUpdatedDateTime": "2017-09-22T23:57:54.3768768Z",
29+
"benefitStartTime": "2017-09-22T23:50:54.3768768Z",
2930
"reservedResourceType": "VirtualMachines",
3031
"instanceFlexibility": "On",
3132
"skuDescription": "D1 v2",
@@ -62,6 +63,7 @@
6263
"message": "An operation is in progress on your reservation. Please wait for operation to complete before taking further action"
6364
},
6465
"lastUpdatedDateTime": "2017-09-22T23:57:47.488284Z",
66+
"benefitStartTime": "2017-09-22T23:50:54.3768768Z",
6567
"reservedResourceType": "VirtualMachines",
6668
"instanceFlexibility": "On",
6769
"skuDescription": "D1 v2",
@@ -94,6 +96,7 @@
9496
"billingPlan": "Monthly",
9597
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
9698
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
99+
"benefitStartTime": "2017-09-22T22:00:54.3768768Z",
97100
"reservedResourceType": "VirtualMachines",
98101
"instanceFlexibility": "On",
99102
"skuDescription": "D1 v2",
@@ -128,6 +131,7 @@
128131
"displayName": "cabri_test",
129132
"effectiveDateTime": "2017-09-22T22:46:27.3313607Z",
130133
"lastUpdatedDateTime": "2017-09-22T22:46:27.3313607Z",
134+
"benefitStartTime": "2017-09-22T23:40:54.3768768Z",
131135
"reservedResourceType": "VirtualMachines",
132136
"instanceFlexibility": "On",
133137
"skuDescription": "D1 v2",

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"message": "This reservation was split and is no longer active."
3535
},
3636
"lastUpdatedDateTime": "2017-09-22T01:00:36.3191627Z",
37+
"benefitStartTime": "2017-09-22T00:00:36.3191627Z",
3738
"reservedResourceType": "VirtualMachines",
3839
"instanceFlexibility": "On",
3940
"skuDescription": "D1 v2",
@@ -72,6 +73,7 @@
7273
"message": "This reservation was merged and is no longer active."
7374
},
7475
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
76+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
7577
"reservedResourceType": "VirtualMachines",
7678
"instanceFlexibility": "On",
7779
"skuDescription": "D1 v2",
@@ -110,6 +112,7 @@
110112
"message": "This reservation was merged and is no longer active."
111113
},
112114
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
115+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
113116
"reservedResourceType": "VirtualMachines",
114117
"instanceFlexibility": "On",
115118
"skuDescription": "D1 v2",
@@ -144,6 +147,7 @@
144147
"billingPlan": "Monthly",
145148
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
146149
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
150+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
147151
"reservedResourceType": "VirtualMachines",
148152
"instanceFlexibility": "On",
149153
"skuDescription": "D1 v2",
@@ -178,6 +182,7 @@
178182
"billingPlan": "Monthly",
179183
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
180184
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
185+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
181186
"reservedResourceType": "VirtualMachines",
182187
"instanceFlexibility": "On",
183188
"skuDescription": "D1 v2",
@@ -209,6 +214,7 @@
209214
"billingPlan": "Monthly",
210215
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
211216
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
217+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
212218
"reservedResourceType": "VirtualMachines",
213219
"instanceFlexibility": "On",
214220
"skuDescription": "D1 v2",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"billingPlan": "Monthly",
3333
"effectiveDateTime": "2017-09-22T23:57:48.1891638Z",
3434
"lastUpdatedDateTime": "2017-09-22T23:57:54.3768768Z",
35+
"benefitStartTime": "2017-09-22T23:55:54.3768768Z",
3536
"reservedResourceType": "VirtualMachines",
3637
"instanceFlexibility": "Off",
3738
"skuDescription": "D1 v2",

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,11 @@
10561056
"format": "date",
10571057
"description": "This is the date when the Reservation will expire."
10581058
},
1059+
"benefitStartTime": {
1060+
"type": "string",
1061+
"format": "date-time",
1062+
"description": "This is the DateTime when the reservation benefit started."
1063+
},
10591064
"originalQuantity": {
10601065
"$ref": "#/definitions/ReservationQuantity"
10611066
},
@@ -1249,6 +1254,11 @@
12491254
"format": "date-time",
12501255
"description": "DateTime of the Reservation starting when this version is effective from."
12511256
},
1257+
"benefitStartTime": {
1258+
"type": "string",
1259+
"format": "date-time",
1260+
"description": "This is the DateTime when the reservation benefit started."
1261+
},
12521262
"lastUpdatedDateTime": {
12531263
"type": "string",
12541264
"format": "date-time",

‎specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,11 @@
969969
"Failed",
970970
"Split",
971971
"Merged"
972-
]
972+
],
973+
"x-ms-enum": {
974+
"name": "ProvisioningState",
975+
"modelAsString": true
976+
}
973977
},
974978
"ReservedResourceType": {
975979
"type": "string",
@@ -1035,7 +1039,11 @@
10351039
"uksouth",
10361040
"westcentralus",
10371041
"ukwest"
1038-
]
1042+
],
1043+
"x-ms-enum": {
1044+
"name": "Location",
1045+
"modelAsString": true
1046+
}
10391047
},
10401048
"AvailableScopeRequest": {
10411049
"type": "object",
@@ -1461,7 +1469,11 @@
14611469
"Processing",
14621470
"Cancelled",
14631471
"Failed"
1464-
]
1472+
],
1473+
"x-ms-enum": {
1474+
"name": "DisplayProvisioningState",
1475+
"modelAsString": true
1476+
}
14651477
},
14661478
"UserFriendlyAppliedScopeType": {
14671479
"type": "string",
@@ -1472,7 +1484,11 @@
14721484
"Single",
14731485
"ResourceGroup",
14741486
"ManagementGroup"
1475-
]
1487+
],
1488+
"x-ms-enum": {
1489+
"name": "UserFriendlyAppliedScopeType",
1490+
"modelAsString": true
1491+
}
14761492
},
14771493
"UserFriendlyRenewState": {
14781494
"type": "string",
@@ -1483,7 +1499,11 @@
14831499
"Renewed",
14841500
"NotRenewed",
14851501
"NotApplicable"
1486-
]
1502+
],
1503+
"x-ms-enum": {
1504+
"name": "UserFriendlyRenewState",
1505+
"modelAsString": true
1506+
}
14871507
},
14881508
"ReservationTerm": {
14891509
"type": "string",

0 commit comments

Comments
 (0)