Skip to content

Swagger correctness fix with other changes #25

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

Merged
vaishnavi-janardhan merged 3 commits into from
Sep 8, 2021
Merged

Swagger correctness fix with other changes #25

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
0b642ed
Swagger correctness fix with other changes
vaishnavi-janardhan Sep 8, 2021
0180fef
minor fix for description of expand on listProductFamilies call
vaishnavi-janardhan Sep 8, 2021
a452f64
Change expamd description for listOrderItem calls
vaishnavi-janardhan Sep 8, 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
68 changes: 57 additions & 11 deletions .../edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
{
"name": "$expand",
"in": "query",
"description": "$expand is supported on device details, forward shipping details and reverse shipping details parameters. Each of these can be provided as a comma separated list. Device Details for order item provides details on the devices of the product, Forward and Reverse Shipping details provide forward and reverse shipping details respectively.",
"description": "$expand is supported on configurations parameter for product, which provides details on the configurations for the product.",
"required": false,
"type": "string"
},
Expand Down Expand Up @@ -354,7 +354,7 @@
"tags": [
"OrderItems"
],
"description": "Lists order at subscription level.",
"description": "Lists order item at subscription level.",
"operationId": "ListOrderItemsAtSubscriptionLevel",
"consumes": [
"application/json"
Expand All @@ -376,17 +376,24 @@
"required": false,
"type": "string"
},
{
"name": "$expand",
"in": "query",
"description": "$expand is supported on device details, forward shipping details and reverse shipping details parameters. Each of these can be provided as a comma separated list. Device Details for order item provides details on the devices of the product, Forward and Reverse Shipping details provide forward and reverse shipping details respectively.",
"required": false,
"type": "string"
},
{
"name": "$skipToken",
"in": "query",
"description": "$skipToken is supported on Get list of orders, which provides the next page in the list of order.",
"description": "$skipToken is supported on Get list of order items, which provides the next page in the list of order items.",
"required": false,
"type": "string"
}
],
"responses": {
"200": {
"description": "Order item object",
"description": "List of Order item object",
"schema": {
"$ref": "#/definitions/OrderItemResourceList"
}
Expand Down Expand Up @@ -554,7 +561,7 @@
],
"responses": {
"200": {
"description": "Address object.",
"description": "Address resource object.",
"schema": {
"$ref": "#/definitions/AddressResource"
}
Expand Down Expand Up @@ -832,7 +839,7 @@
{
"name": "$expand",
"in": "query",
"description": "$expand is supported on device details parameter for order item, which provides details on the devices of the product.",
"description": "$expand is supported on device details, forward shipping details and reverse shipping details parameters. Each of these can be provided as a comma separated list. Device Details for order item provides details on the devices of the product, Forward and Reverse Shipping details provide forward and reverse shipping details respectively.",
"required": false,
"type": "string"
},
Expand Down Expand Up @@ -897,7 +904,7 @@
{
"name": "$expand",
"in": "query",
"description": "$expand is supported on device details parameter for order item, which provides details on the devices of the product.",
"description": "$expand is supported on device details, forward shipping details and reverse shipping details parameters. Each of these can be provided as a comma separated list. Device Details for order item provides details on the devices of the product, Forward and Reverse Shipping details provide forward and reverse shipping details respectively.",
"required": false,
"type": "string"
}
Expand Down Expand Up @@ -1781,6 +1788,11 @@
"description": "Management Resource Id",
"type": "string",
"readOnly": true
},
"managementResourceTenantId": {
"description": "Management Resource Tenant ID",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -1887,7 +1899,7 @@
"type": "object",
"properties": {
"doubleEncryptionStatus": {
"description": "Defines secondary layer of software-based encryption enablement.",
"description": "Double encryption status as entered by the customer. It is compulsory to give this parameter if the 'Deny' or 'Disabled' policy is configured.",
"enum": [
"Disabled",
"Enabled"
Expand Down Expand Up @@ -2343,7 +2355,7 @@
"readOnly": true
},
"cancellationStatus": {
"description": "Describes whether the orderItem is cancellable or not.",
"description": "Describes whether the order item is cancellable or not.",
"enum": [
"Cancellable",
"CancellableWithFee",
Expand Down Expand Up @@ -2399,7 +2411,7 @@
"readOnly": true
},
"returnStatus": {
"description": "Describes whether the orderItem is returnable or not.",
"description": "Describes whether the order item is returnable or not.",
"enum": [
"Returnable",
"ReturnableWithFee",
Expand Down Expand Up @@ -2759,7 +2771,32 @@
"count": {
"format": "int32",
"description": "Quantity of the product",
"type": "integer"
"type": "integer",
"readOnly": true
},
"productDoubleEncryptionStatus": {
"description": "Double encryption status of the configuration. Read-only field.",
"enum": [
"Disabled",
"Enabled"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "DoubleEncryptionStatus",
"modelAsString": true,
"values": [
{
"value": "Disabled",
"description": "Double encryption is disabled"
},
{
"value": "Enabled",
"description": "Double encryption is enabled"
}
]
},
"default": "Disabled"
},
"deviceDetails": {
"description": "list of device details",
Expand Down Expand Up @@ -3000,6 +3037,15 @@
"returnReason": {
"description": "Return Reason.",
"type": "string"
},
"serviceTag": {
"description": "Service tag (located on the bottom-right corner of the device)",
"type": "string"
},
"shippingBoxRequired": {
"description": "Shipping Box required",
"default": false,
"type": "boolean"
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down
3 changes: 2 additions & 1 deletion ...e-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down
6 changes: 4 additions & 2 deletions ...oft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down Expand Up @@ -122,7 +123,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down
6 changes: 4 additions & 2 deletions ...soft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down Expand Up @@ -120,7 +121,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
"productName": "azurestackedgegpu",
"configurationName": "azurestackedgegpu"
},
"count": 0
"count": 0,
"productDoubleEncryptionStatus": "Disabled"
},
"orderItemType": "Purchase",
"currentStage": {
Expand Down