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.

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

Fixing S360 issues #17014

Merged
merged 2 commits into from
Jan 4, 2022
+143 −1
Merged

Fixing S360 issues #17014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db5c3d
Fixing S360 issues
gaoyp830 Dec 9, 2021
54b7f46
Fix style
gaoyp830 Dec 9, 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
10 changes: 10 additions & 0 deletions ...ervations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
"P1Y",
"P3Y"
],
"msrp": {
"p1Y": {
"currencyCode": "USD",
"amount": 1907
},
"p3Y": {
"currencyCode": "USD",
"amount": 3960
}
},
"billingPlans": {
"P1Y": [
"Upfront",
Expand Down
3 changes: 3 additions & 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 @@ -70,6 +70,9 @@
"currencyCode": "USD",
"amount": 466.0
}
},
"swapProperties": {
"swapSource": "/providers/microsoft.capacity/reservationOrders/63037ae3-385a-4716-ad77-02f42ce93c06/reservations/5c6383f5-3f2c-4159-ae74-j72i1c1a49bc"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...ource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationRevisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/e0e4b4f5-77ea-4984-9ee4-6bf9850ee6de"
]
},
"swapProperties": {
"swapDestination": "/providers/microsoft.capacity/reservationOrders/afadf486-3432-4254-b297-4db8ef055f38/reservations/317efb41-b3ef-3706-8447-c2c045ab3ef5"
}
}
},
Expand Down
62 changes: 62 additions & 0 deletions ...ions/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,68 @@
]
}
}
},
{
"sku": {
"name": "Standard_DS1_v2"
},
"id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/4jf50113-3382-40da-ed79-787f823e34bc",
"type": "Microsoft.Capacity/reservationOrders/reservations",
"name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/4jf50113-3382-40da-ed79-787f823e34bc",
"etag": 2,
"location": "eastus",
"properties": {
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Succeeded",
"expiryDate": "2018-09-22",
"displayName": "cabri_test",
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
"swapProperties": {
"swapSource": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc"
}
}
},
{
"sku": {
"name": "Standard_D1_v2"
},
"id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc",
"type": "Microsoft.Capacity/reservationOrders/reservations",
"name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/5se63214-3382-40da-ed79-787f823e34bc",
"etag": 2,
"location": "eastus",
"properties": {
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Succeeded",
"expiryDate": "2018-09-22",
"displayName": "cabri_test",
"billingPlan": "Monthly",
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
"reservedResourceType": "VirtualMachines",
"instanceFlexibility": "On",
"skuDescription": "D1 v2",
"swapProperties": {
"swapDestination": "/providers/microsoft.capacity/reservationOrders/63027ae3-389a-4716-ad77-04f42ce93c06/reservations/4jf50113-3382-40da-ed79-787f823e34bc"
}
}
}
]
}
Expand Down
7 changes: 6 additions & 1 deletion ...ns/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"etag": 4,
"location": "eastus",
"properties": {
"appliedScopeType": "Shared",
"appliedScopeType": "ManagementGroup",
"renew": false,
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
"quantity": 3,
Expand All @@ -40,6 +40,11 @@
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/e0e4b4f5-77ea-4984-9ee4-6bf9850ee6de"
]
},
"appliedScopeProperties": {
"tenantId": "d432d7b4-3bc4-4hef-97f1-a6e34f37c9d3",
"managementGroupId": "/providers/Microsoft.Management/managementGroups/TestMG1",
"displayName": "TestMG1"
}
}
}
Expand Down
59 changes: 59 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 @@ -820,6 +820,16 @@
}
}
},
"msrp": {
"type": "object",
"description": "The sku's MSRP values for each term",
"additionalProperties": {
"type": "object",
"items": {
"$ref": "#/definitions/MsrpProperty"
}
}
},
"terms": {
"type": "array",
"readOnly": true,
Expand Down Expand Up @@ -852,6 +862,19 @@
}
}
},
"MsrpProperty": {
"type": "object",
"properties": {
"currencyCode": {
"type": "string",
"description": "Represents the currency code - 3 character ISO."
},
"amount": {
"type": "number",
"description": "Represents the amount of money in the currency."
}
}
},
"SkuProperty": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1253,6 +1276,12 @@
"mergeProperties": {
"$ref": "#/definitions/ReservationMergeProperties"
},
"swapProperties": {
"$ref": "#/definitions/ReservationSwapProperties"
},
"appliedScopeProperties": {
"$ref": "#/definitions/AppliedScopeProperties"
},
"billingScopeId": {
"$ref": "#/definitions/BillingScopeId"
},
Expand Down Expand Up @@ -1283,6 +1312,23 @@
}
}
},
"AppliedScopeProperties": {
"type": "object",
"properties": {
"tenantId": {
"type": "string",
"description": "Tenant ID of the applied scope type"
},
"managementGroupId": {
"type": "string",
"description": "Management group ID of the format /providers/Microsoft.Management/managementGroups/{managementGroupId}"
},
"displayName": {
"type": "string",
"description": "Management group display name"
}
}
},
"ReservationSplitProperties": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1315,6 +1361,19 @@
}
}
},
"ReservationSwapProperties": {
"type": "object",
"properties": {
"swapSource": {
"type": "string",
"description": "Resource Id of the Source Reservation that gets swapped. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
},
"swapDestination": {
"type": "string",
"description": "Reservation Resource Id that the original resource gets swapped to. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
}
}
},
"PurchaseRequestProperties": {
"type": "object",
"properties": {
Expand Down