Skip to content

Commit f985f05

Browse files
t-vjanardhansashanm
t-vjanardhan
and
sashanm
authored
[EdgeOrder] Update 2020-12-01-preview swagger and add readme files (Azure#14935)
* new api changes (#1) * new api changes * referer url change * EdgeOrder 2020-12-01-preview Swagger changes (#5) * readme changes * Swagger refresh and update examples * Change examples as per oav validations * Minor swagger modifications * Minor spacing adjustments * Set ModelAsString to true for enums and modify examples * Fix swagger lint validation error * Modify readme and examples * Modify readme.go.md * Update swagger * Minor prettier fix * Change python package version in readme * Fix spell check error Co-authored-by: sashanm <[email protected]>
1 parent 109afe5 commit f985f05

25 files changed

+757
-560
lines changed

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json‎

Lines changed: 245 additions & 183 deletions
Large diffs are not rendered by default.

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"parameters": {
33
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
44
"resourceGroupName": "TestRG",
5-
"orderItemName": "TestOrderName1",
5+
"orderItemName": "TestOrderItemName1",
66
"api-version": "2020-12-01-preview",
77
"User-Agent": [
88
"vscode-restclient"
99
],
1010
"Referer": [
11-
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1/cancel?api-version=2020-12-01-preview"
11+
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName1/cancel?api-version=2020-12-01-preview"
1212
],
1313
"Content-Type": [
1414
"application/json; charset=utf-8"

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressCreate.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
"Referer": [
1111
"https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/addresses/TestMSAddressName?api-version=2020-12-01-preview"
1212
],
13-
"x-ms-client-tenant-id": [
14-
" 72f988bf-86f1-41af-91ab-2d7cd011db47"
15-
],
1613
"Content-Type": [
1714
"application/json; charset=utf-8"
1815
],
1916
"Content-Length": [
20-
"474"
17+
"492"
2118
],
2219
"addressResource": {
2320
"properties": {
@@ -33,10 +30,10 @@
3330
},
3431
"contactDetails": {
3532
"contactName": "Petr Cech",
36-
"phone": "123344334",
33+
"phone": "1234567890",
3734
"phoneExtension": "",
3835
"emailList": [
39-
"ssemcr@microsoft.com"
36+
"testemail@microsoft.com"
4037
]
4138
}
4239
},
@@ -50,21 +47,19 @@
5047
"shippingAddress": {
5148
"streetAddress1": "16 TOWNSEND ST",
5249
"streetAddress2": "UNIT 1",
53-
"streetAddress3": "",
5450
"city": "San Francisco",
5551
"stateOrProvince": "CA",
5652
"country": "US",
5753
"postalCode": "94107",
58-
"zipExtendedCode": "",
5954
"companyName": "Microsoft",
6055
"addressType": "None"
6156
},
6257
"contactDetails": {
6358
"contactName": "Petr Cech",
64-
"phone": "123344334",
59+
"phone": "1234567890",
6560
"phoneExtension": "",
6661
"emailList": [
67-
"ssemcr@microsoft.com"
62+
"testemail@microsoft.com"
6863
]
6964
}
7065
},

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
"application/json; charset=utf-8"
1515
],
1616
"Content-Length": [
17-
"1388"
17+
"1358"
1818
],
1919
"orderItemResource": {
2020
"properties": {
2121
"orderItemDetails": {
2222
"orderItemType": "Purchase",
2323
"productDetails": {
2424
"hierarchyInformation": {
25-
"productFamilyName": "azurestackedge",
26-
"productLineName": "Azure Stack Edge_Pl",
27-
"productName": "Azure Stack Edge Pro - FPGA",
28-
"configurationName": "Azure Stack Edge Pro - FPGA 1 GPU"
25+
"productFamilyName": "AzureStackEdge",
26+
"productLineName": "AzureStackEdge",
27+
"productName": "AzureStackEdgeGPU",
28+
"configurationName": "AzureStackEdgeGPU"
2929
}
3030
},
3131
"preferences": {
@@ -37,19 +37,19 @@
3737
"addressDetails": {
3838
"forwardAddress": {
3939
"shippingAddress": {
40-
"streetAddress1": "16 townsend st",
41-
"streetAddress2": "unit 1",
42-
"city": "san francisco",
43-
"stateOrProvince": "ca",
44-
"country": "us",
40+
"streetAddress1": "16 TOWNSEND ST",
41+
"streetAddress2": "UNIT 1",
42+
"city": "San Francisco",
43+
"stateOrProvince": "CA",
44+
"country": "US",
4545
"postalCode": "94107",
46-
"companyName": "microsoft",
46+
"companyName": "Microsoft",
4747
"zipExtendedCode": "1",
4848
"addressType": "Residential"
4949
},
5050
"contactDetails": {
5151
"contactName": "164 TOWNSEND ST",
52-
"phone": "32131311",
52+
"phone": "3213131190",
5353
"emailList": [
5454
"[email protected]",
5555
"[email protected]"
@@ -72,37 +72,48 @@
7272
"properties": {
7373
"orderItemDetails": {
7474
"productDetails": {
75+
"displayInfo": {
76+
"productFamilyDisplayName": "Azure Stack Edge",
77+
"configurationDisplayName": "Azure Stack Edge Pro - 1 GPU"
78+
},
7579
"hierarchyInformation": {
7680
"productFamilyName": "azurestackedge",
77-
"productLineName": "azure stack edge_pl",
78-
"productName": "azure stack edge pro - fpga",
79-
"configurationName": "azure stack edge pro - fpga 1 gpu"
81+
"productLineName": "azurestackedge",
82+
"productName": "azurestackedgegpu",
83+
"configurationName": "azurestackedgegpu"
8084
},
81-
"count": 0,
82-
"deviceDetails": []
85+
"count": 0
8386
},
8487
"orderItemType": "Purchase",
8588
"currentStage": {
8689
"stageStatus": "InProgress",
87-
"stageName": "InReview",
88-
"startTime": "2021-03-24T15:17:13.1376775+05:30"
90+
"stageName": "Placed",
91+
"startTime": "2021-06-07T13:08:14.0368516+05:30"
8992
},
9093
"orderItemStageHistory": [
9194
{
9295
"stageStatus": "None",
93-
"stageName": "InReview"
96+
"stageName": "Placed"
9497
},
9598
{
9699
"stageStatus": "None",
97-
"stageName": "Placed"
100+
"stageName": "Confirmed"
98101
},
99102
{
100103
"stageStatus": "None",
101-
"stageName": "Confirmed"
104+
"stageName": "ReadyToShip"
105+
},
106+
{
107+
"stageStatus": "None",
108+
"stageName": "Shipped"
109+
},
110+
{
111+
"stageStatus": "None",
112+
"stageName": "Delivered"
102113
},
103114
{
104115
"stageStatus": "None",
105-
"stageName": "ReadyForDispatch"
116+
"stageName": "InUse"
106117
}
107118
],
108119
"preferences": {
@@ -112,8 +123,8 @@
112123
},
113124
"notificationEmailList": [],
114125
"cancellationStatus": "Cancellable",
115-
"deletionStatus": "Allowed",
116-
"returnStatus": "Returnable"
126+
"deletionStatus": "NotAllowed",
127+
"returnStatus": "NotReturnable"
117128
},
118129
"addressDetails": {
119130
"forwardAddress": {
@@ -130,15 +141,15 @@
130141
},
131142
"contactDetails": {
132143
"contactName": "164 TOWNSEND ST",
133-
"phone": "32131311",
144+
"phone": "3213131190",
134145
"emailList": [
135146
"[email protected]",
136147
"[email protected]"
137148
]
138149
}
139150
}
140151
},
141-
"startTime": "2021-03-24T15:17:13.1376775+05:30",
152+
"startTime": "2021-06-07T13:08:14.0368516+05:30",
142153
"orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01"
143154
},
144155
"location": "westus",

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressDelete.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json‎

File renamed without changes.

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json‎

File renamed without changes.

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressGetByName.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@
1818
"shippingAddress": {
1919
"streetAddress1": "16 TOWNSEND ST",
2020
"streetAddress2": "UNIT 1",
21-
"streetAddress3": "",
2221
"city": "San Francisco",
2322
"stateOrProvince": "CA",
2423
"country": "US",
2524
"postalCode": "94107",
26-
"zipExtendedCode": "",
2725
"companyName": "Microsoft",
2826
"addressType": "None"
2927
},
3028
"contactDetails": {
3129
"contactName": "Petr Cech",
32-
"phone": "123344334",
30+
"phone": "1234567890",
3331
"phoneExtension": "",
3432
"emailList": [
3533
"[email protected]"

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,20 @@
2020
"/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901"
2121
],
2222
"currentStage": {
23-
"stageStatus": "InProgress",
23+
"stageStatus": "Succeeded",
2424
"stageName": "InReview",
25-
"startTime": "0001-01-01T05:30:00+05:30"
25+
"startTime": "2021-06-07T15:30:35.4512229+05:30"
2626
},
2727
"orderStageHistory": [
2828
{
29-
"stageStatus": "None",
30-
"stageName": "InReview"
29+
"stageStatus": "Succeeded",
30+
"stageName": "Placed",
31+
"startTime": "2021-06-07T15:24:58.7140341+05:30"
3132
},
3233
{
33-
"stageStatus": "None",
34-
"stageName": "Placed"
35-
},
36-
{
37-
"stageStatus": "None",
38-
"stageName": "Confirmed"
34+
"stageStatus": "Succeeded",
35+
"stageName": "InReview",
36+
"startTime": "2021-06-07T15:30:35.4512229+05:30"
3937
}
4038
]
4139
},

‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json‎ renamed to ‎specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,48 @@
1717
"properties": {
1818
"orderItemDetails": {
1919
"productDetails": {
20+
"displayInfo": {
21+
"productFamilyDisplayName": "Azure Stack Edge",
22+
"configurationDisplayName": "Azure Stack Edge Pro - 1 GPU"
23+
},
2024
"hierarchyInformation": {
2125
"productFamilyName": "azurestackedge",
22-
"productLineName": "azure stack edge_pl",
23-
"productName": "azure stack edge pro - fpga",
24-
"configurationName": "azure stack edge pro - fpga 1 gpu"
26+
"productLineName": "azurestackedge",
27+
"productName": "azurestackedgegpu",
28+
"configurationName": "azurestackedgegpu"
2529
},
26-
"count": 0,
27-
"deviceDetails": []
30+
"count": 0
2831
},
2932
"orderItemType": "Purchase",
3033
"currentStage": {
3134
"stageStatus": "InProgress",
32-
"stageName": "InReview",
33-
"startTime": "2021-03-24T15:17:13.1376775+05:30"
35+
"stageName": "Placed",
36+
"startTime": "2021-06-07T13:08:14.0368516+05:30"
3437
},
3538
"orderItemStageHistory": [
3639
{
3740
"stageStatus": "None",
38-
"stageName": "InReview"
41+
"stageName": "Placed"
3942
},
4043
{
4144
"stageStatus": "None",
42-
"stageName": "Placed"
45+
"stageName": "Confirmed"
4346
},
4447
{
4548
"stageStatus": "None",
46-
"stageName": "Confirmed"
49+
"stageName": "ReadyToShip"
50+
},
51+
{
52+
"stageStatus": "None",
53+
"stageName": "Shipped"
54+
},
55+
{
56+
"stageStatus": "None",
57+
"stageName": "Delivered"
4758
},
4859
{
4960
"stageStatus": "None",
50-
"stageName": "ReadyForDispatch"
61+
"stageName": "InUse"
5162
}
5263
],
5364
"preferences": {
@@ -57,8 +68,8 @@
5768
},
5869
"notificationEmailList": [],
5970
"cancellationStatus": "Cancellable",
60-
"deletionStatus": "Allowed",
61-
"returnStatus": "Returnable"
71+
"deletionStatus": "NotAllowed",
72+
"returnStatus": "NotReturnable"
6273
},
6374
"addressDetails": {
6475
"forwardAddress": {
@@ -75,15 +86,15 @@
7586
},
7687
"contactDetails": {
7788
"contactName": "164 TOWNSEND ST",
78-
"phone": "32131311",
89+
"phone": "3213131190",
7990
"emailList": [
8091
"[email protected]",
8192
"[email protected]"
8293
]
8394
}
8495
}
8596
},
86-
"startTime": "2021-03-24T15:17:13.1376775+05:30",
97+
"startTime": "2021-06-07T13:08:14.0368516+05:30",
8798
"orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01"
8899
},
89100
"location": "westus",

0 commit comments

Comments
 (0)