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

Jump to bottom

[EdgeOrder] Update 2020-12-01-preview swagger and add readme files #14935

Merged
merged 3 commits into from
Jul 2, 2021
Merged

[EdgeOrder] Update 2020-12-01-preview swagger and add readme files #14935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daf2e7d
new api changes (#1)
sashanm Mar 24, 2021
8bad41a
Merge branch 'Azure:master' into master
t-vjanardhan Jun 7, 2021
108fb2c
EdgeOrder 2020-12-01-preview Swagger changes (#5)
t-vjanardhan Jun 22, 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
428 changes: 245 additions & 183 deletions .../edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...-01-preview/examples/OrderItemCancel.json → ...-01-preview/examples/CancelOrderItem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "TestRG",
"orderItemName": "TestOrderName1",
"orderItemName": "TestOrderItemName1",
"api-version": "2020-12-01-preview",
"User-Agent": [
"vscode-restclient"
],
"Referer": [
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1/cancel?api-version=2020-12-01-preview"
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName1/cancel?api-version=2020-12-01-preview"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand Down
15 changes: 5 additions & 10 deletions ...12-01-preview/examples/AddressCreate.json → ...12-01-preview/examples/CreateAddress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@
"Referer": [
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/addresses/TestMSAddressName?api-version=2020-12-01-preview"
],
"x-ms-client-tenant-id": [
" 72f988bf-86f1-41af-91ab-2d7cd011db47"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Content-Length": [
"474"
"492"
],
"addressResource": {
"properties": {
Expand All @@ -33,10 +30,10 @@
},
"contactDetails": {
"contactName": "Petr Cech",
"phone": "123344334",
"phone": "1234567890",
"phoneExtension": "",
"emailList": [
"ssemcr@microsoft.com"
"testemail@microsoft.com"
]
}
},
Expand All @@ -50,21 +47,19 @@
"shippingAddress": {
"streetAddress1": "16 TOWNSEND ST",
"streetAddress2": "UNIT 1",
"streetAddress3": "",
"city": "San Francisco",
"stateOrProvince": "CA",
"country": "US",
"postalCode": "94107",
"zipExtendedCode": "",
"companyName": "Microsoft",
"addressType": "None"
},
"contactDetails": {
"contactName": "Petr Cech",
"phone": "123344334",
"phone": "1234567890",
"phoneExtension": "",
"emailList": [
"ssemcr@microsoft.com"
"testemail@microsoft.com"
]
}
},
Expand Down
65 changes: 38 additions & 27 deletions ...-01-preview/examples/OrderItemCreate.json → ...-01-preview/examples/CreateOrderItem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"application/json; charset=utf-8"
],
"Content-Length": [
"1388"
"1358"
],
"orderItemResource": {
"properties": {
"orderItemDetails": {
"orderItemType": "Purchase",
"productDetails": {
"hierarchyInformation": {
"productFamilyName": "azurestackedge",
"productLineName": "Azure Stack Edge_Pl",
"productName": "Azure Stack Edge Pro - FPGA",
"configurationName": "Azure Stack Edge Pro - FPGA 1 GPU"
"productFamilyName": "AzureStackEdge",
"productLineName": "AzureStackEdge",
"productName": "AzureStackEdgeGPU",
"configurationName": "AzureStackEdgeGPU"
}
},
"preferences": {
Expand All @@ -37,19 +37,19 @@
"addressDetails": {
"forwardAddress": {
"shippingAddress": {
"streetAddress1": "16 townsend st",
"streetAddress2": "unit 1",
"city": "san francisco",
"stateOrProvince": "ca",
"country": "us",
"streetAddress1": "16 TOWNSEND ST",
"streetAddress2": "UNIT 1",
"city": "San Francisco",
"stateOrProvince": "CA",
"country": "US",
"postalCode": "94107",
"companyName": "microsoft",
"companyName": "Microsoft",
"zipExtendedCode": "1",
"addressType": "Residential"
},
"contactDetails": {
"contactName": "164 TOWNSEND ST",
"phone": "32131311",
"phone": "3213131190",
"emailList": [
"ssemmail@microsoft.com",
"vishwamdir@microsoft.com"
Expand All @@ -72,37 +72,48 @@
"properties": {
"orderItemDetails": {
"productDetails": {
"displayInfo": {
"productFamilyDisplayName": "Azure Stack Edge",
"configurationDisplayName": "Azure Stack Edge Pro - 1 GPU"
},
"hierarchyInformation": {
"productFamilyName": "azurestackedge",
"productLineName": "azure stack edge_pl",
"productName": "azure stack edge pro - fpga",
"configurationName": "azure stack edge pro - fpga 1 gpu"
"productLineName": "azurestackedge",
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0,
"deviceDetails": []
"count": 0
},
"orderItemType": "Purchase",
"currentStage": {
"stageStatus": "InProgress",
"stageName": "InReview",
"startTime": "2021-03-24T15:17:13.1376775+05:30"
"stageName": "Placed",
"startTime": "2021-06-07T13:08:14.0368516+05:30"
},
"orderItemStageHistory": [
{
"stageStatus": "None",
"stageName": "InReview"
"stageName": "Placed"
},
{
"stageStatus": "None",
"stageName": "Placed"
"stageName": "Confirmed"
},
{
"stageStatus": "None",
"stageName": "Confirmed"
"stageName": "ReadyToShip"
},
{
"stageStatus": "None",
"stageName": "Shipped"
},
{
"stageStatus": "None",
"stageName": "Delivered"
},
{
"stageStatus": "None",
"stageName": "ReadyForDispatch"
"stageName": "InUse"
}
],
"preferences": {
Expand All @@ -112,8 +123,8 @@
},
"notificationEmailList": [],
"cancellationStatus": "Cancellable",
"deletionStatus": "Allowed",
"returnStatus": "Returnable"
"deletionStatus": "NotAllowed",
"returnStatus": "NotReturnable"
},
"addressDetails": {
"forwardAddress": {
Expand All @@ -130,15 +141,15 @@
},
"contactDetails": {
"contactName": "164 TOWNSEND ST",
"phone": "32131311",
"phone": "3213131190",
"emailList": [
"ssemmail@microsoft.com",
"vishwamdir@microsoft.com"
]
}
}
},
"startTime": "2021-03-24T15:17:13.1376775+05:30",
"startTime": "2021-06-07T13:08:14.0368516+05:30",
"orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01"
},
"location": "westus",
Expand Down
0 ...12-01-preview/examples/AddressDelete.json → ...preview/examples/DeleteAddressByName.json
View file
Open in desktop
File renamed without changes.
0 ...-01-preview/examples/OrderItemDelete.json → ...eview/examples/DeleteOrderItemByName.json
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions ...01-preview/examples/AddressGetByName.json → ...01-preview/examples/GetAddressByName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,16 @@
"shippingAddress": {
"streetAddress1": "16 TOWNSEND ST",
"streetAddress2": "UNIT 1",
"streetAddress3": "",
"city": "San Francisco",
"stateOrProvince": "CA",
"country": "US",
"postalCode": "94107",
"zipExtendedCode": "",
"companyName": "Microsoft",
"addressType": "None"
},
"contactDetails": {
"contactName": "Petr Cech",
"phone": "123344334",
"phone": "1234567890",
"phoneExtension": "",
"emailList": [
"ssemcr@microsoft.com"
Expand Down
18 changes: 8 additions & 10 deletions ...ource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,20 @@
"/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901"
],
"currentStage": {
"stageStatus": "InProgress",
"stageStatus": "Succeeded",
"stageName": "InReview",
"startTime": "0001-01-01T05:30:00+05:30"
"startTime": "2021-06-07T15:30:35.4512229+05:30"
},
"orderStageHistory": [
{
"stageStatus": "None",
"stageName": "InReview"
"stageStatus": "Succeeded",
"stageName": "Placed",
"startTime": "2021-06-07T15:24:58.7140341+05:30"
},
{
"stageStatus": "None",
"stageName": "Placed"
},
{
"stageStatus": "None",
"stageName": "Confirmed"
"stageStatus": "Succeeded",
"stageName": "InReview",
"startTime": "2021-06-07T15:30:35.4512229+05:30"
}
]
},
Expand Down
41 changes: 26 additions & 15 deletions ...-12-01-preview/examples/OrderItemGet.json → ...-preview/examples/GetOrderItemByName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,48 @@
"properties": {
"orderItemDetails": {
"productDetails": {
"displayInfo": {
"productFamilyDisplayName": "Azure Stack Edge",
"configurationDisplayName": "Azure Stack Edge Pro - 1 GPU"
},
"hierarchyInformation": {
"productFamilyName": "azurestackedge",
"productLineName": "azure stack edge_pl",
"productName": "azure stack edge pro - fpga",
"configurationName": "azure stack edge pro - fpga 1 gpu"
"productLineName": "azurestackedge",
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0,
"deviceDetails": []
"count": 0
},
"orderItemType": "Purchase",
"currentStage": {
"stageStatus": "InProgress",
"stageName": "InReview",
"startTime": "2021-03-24T15:17:13.1376775+05:30"
"stageName": "Placed",
"startTime": "2021-06-07T13:08:14.0368516+05:30"
},
"orderItemStageHistory": [
{
"stageStatus": "None",
"stageName": "InReview"
"stageName": "Placed"
},
{
"stageStatus": "None",
"stageName": "Placed"
"stageName": "Confirmed"
},
{
"stageStatus": "None",
"stageName": "Confirmed"
"stageName": "ReadyToShip"
},
{
"stageStatus": "None",
"stageName": "Shipped"
},
{
"stageStatus": "None",
"stageName": "Delivered"
},
{
"stageStatus": "None",
"stageName": "ReadyForDispatch"
"stageName": "InUse"
}
],
"preferences": {
Expand All @@ -57,8 +68,8 @@
},
"notificationEmailList": [],
"cancellationStatus": "Cancellable",
"deletionStatus": "Allowed",
"returnStatus": "Returnable"
"deletionStatus": "NotAllowed",
"returnStatus": "NotReturnable"
},
"addressDetails": {
"forwardAddress": {
Expand All @@ -75,15 +86,15 @@
},
"contactDetails": {
"contactName": "164 TOWNSEND ST",
"phone": "32131311",
"phone": "3213131190",
"emailList": [
"ssemmail@microsoft.com",
"vishwamdir@microsoft.com"
]
}
}
},
"startTime": "2021-03-24T15:17:13.1376775+05:30",
"startTime": "2021-06-07T13:08:14.0368516+05:30",
"orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01"
},
"location": "westus",
Expand Down
Loading