From f985f05e68b7720cd5cd4c55bd89ce8463f7e554 Mon Sep 17 00:00:00 2001 From: t-vjanardhan <77781522+t-vjanardhan@users.noreply.github.com> Date: Fri, 2 Jul 2021 15:24:20 +0530 Subject: [PATCH] [EdgeOrder] Update 2020-12-01-preview swagger and add readme files (#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 <54701252+sashanm@users.noreply.github.com> --- .../preview/2020-12-01-preview/edgeorder.json | 428 ++++++++++-------- ...erItemCancel.json => CancelOrderItem.json} | 4 +- ...{AddressCreate.json => CreateAddress.json} | 15 +- ...erItemCreate.json => CreateOrderItem.json} | 65 +-- ...ssDelete.json => DeleteAddressByName.json} | 0 ...Delete.json => DeleteOrderItemByName.json} | 0 ...ssGetByName.json => GetAddressByName.json} | 4 +- .../examples/GetOrderByName.json | 18 +- ...erItemGet.json => GetOrderItemByName.json} | 41 +- ...=> ListAddressesAtResourceGroupLevel.json} | 21 +- ... => ListAddressesAtSubscriptionLevel.json} | 21 +- .../examples/ListConfigurations.json | 60 +-- .../examples/ListOperations.json | 60 ++- .../ListOrderAtResourceGroupLevel.json | 36 +- .../ListOrderAtSubscriptionLevel.json | 36 +- ...> ListOrderItemsAtResourceGroupLevel.json} | 86 ++-- ...=> ListOrderItemsAtSubscriptionLevel.json} | 89 ++-- .../examples/ListProductFamilies.json | 144 +++--- .../examples/ListProductFamiliesMetadata.json | 31 +- ...erItemReturn.json => ReturnOrderItem.json} | 0 .../{AddressPatch.json => UpdateAddress.json} | 8 +- ...erItemUpdate.json => UpdateOrderItem.json} | 59 ++- .../edgeorder/resource-manager/readme.go.md | 26 ++ .../edgeorder/resource-manager/readme.md | 41 +- .../resource-manager/readme.python.md | 24 + 25 files changed, 757 insertions(+), 560 deletions(-) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemCancel.json => CancelOrderItem.json} (84%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressCreate.json => CreateAddress.json} (86%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemCreate.json => CreateOrderItem.json} (73%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressDelete.json => DeleteAddressByName.json} (100%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemDelete.json => DeleteOrderItemByName.json} (100%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressGetByName.json => GetAddressByName.json} (93%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemGet.json => GetOrderItemByName.json} (74%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressesGetAtResourceGrouplevel.json => ListAddressesAtResourceGroupLevel.json} (84%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressesGetAtSubscriptionLevel.json => ListAddressesAtSubscriptionLevel.json} (84%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemGetByRG.json => ListOrderItemsAtResourceGroupLevel.json} (70%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemGetBySubscription.json => ListOrderItemsAtSubscriptionLevel.json} (69%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemReturn.json => ReturnOrderItem.json} (100%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{AddressPatch.json => UpdateAddress.json} (94%) rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderItemUpdate.json => UpdateOrderItem.json} (65%) create mode 100644 specification/edgeorder/resource-manager/readme.go.md create mode 100644 specification/edgeorder/resource-manager/readme.python.md diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json index 186bee071977..58deea45c710 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-12-01-preview", - "title": "Edge Ordering Service" + "title": "Edge Ordering Service-Customer" }, "host": "management.azure.com", "schemes": [ @@ -20,7 +20,7 @@ "tags": [ "Operations" ], - "description": "This method gets all the operations.", + "description": "This method gets all the operations that are exposed for customer.", "operationId": "ListOperations", "consumes": [ "application/json" @@ -111,7 +111,7 @@ }, "x-ms-examples": { "ListAddressesAtSubscriptionLevel": { - "$ref": "./examples/AddressesGetAtSubscriptionLevel.json" + "$ref": "./examples/ListAddressesAtSubscriptionLevel.json" } } } @@ -403,7 +403,7 @@ }, "x-ms-examples": { "ListOrderItemsAtSubscriptionLevel": { - "$ref": "./examples/OrderItemGetBySubscription.json" + "$ref": "./examples/ListOrderItemsAtSubscriptionLevel.json" } } } @@ -465,7 +465,7 @@ }, "x-ms-examples": { "ListAddressesAtResourceGroupLevel": { - "$ref": "./examples/AddressesGetAtResourceGrouplevel.json" + "$ref": "./examples/ListAddressesAtResourceGroupLevel.json" } } } @@ -513,7 +513,7 @@ }, "x-ms-examples": { "GetAddressByName": { - "$ref": "./examples/AddressGetByName.json" + "$ref": "./examples/GetAddressByName.json" } } }, @@ -572,7 +572,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "CreateAddress": { - "$ref": "./examples/AddressCreate.json" + "$ref": "./examples/CreateAddress.json" } } }, @@ -622,7 +622,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "DeleteAddressByName": { - "$ref": "./examples/AddressDelete.json" + "$ref": "./examples/DeleteAddressByName.json" } } }, @@ -688,7 +688,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "UpdateAddress": { - "$ref": "./examples/AddressPatch.json" + "$ref": "./examples/UpdateAddress.json" } } } @@ -829,6 +829,13 @@ "required": false, "type": "string" }, + { + "name": "$expand", + "in": "query", + "description": "$expand is supported on device details parameter for order item, which provides details on the devices of the product.", + "required": false, + "type": "string" + }, { "name": "$skipToken", "in": "query", @@ -856,7 +863,7 @@ }, "x-ms-examples": { "ListOrderItemsAtResourceGroupLevel": { - "$ref": "./examples/OrderItemGetByRG.json" + "$ref": "./examples/ListOrderItemsAtResourceGroupLevel.json" } } } @@ -886,6 +893,13 @@ }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "$expand", + "in": "query", + "description": "$expand is supported on device details parameter for order item, which provides details on the devices of the product.", + "required": false, + "type": "string" } ], "responses": { @@ -904,7 +918,7 @@ }, "x-ms-examples": { "GetOrderItemByName": { - "$ref": "./examples/OrderItemGet.json" + "$ref": "./examples/GetOrderItemByName.json" } } }, @@ -963,7 +977,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "CreateOrderItem": { - "$ref": "./examples/OrderItemCreate.json" + "$ref": "./examples/CreateOrderItem.json" } } }, @@ -995,7 +1009,7 @@ ], "responses": { "200": { - "description": "Order Item Deleted" + "description": "Order item Deleted" }, "202": { "description": "Accepted delete request for an order item" @@ -1013,7 +1027,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "DeleteOrderItemByName": { - "$ref": "./examples/OrderItemDelete.json" + "$ref": "./examples/DeleteOrderItemByName.json" } } }, @@ -1064,7 +1078,7 @@ "description": "Accepted request for order item update." }, "200": { - "description": "Order item resource object", + "description": "Order item resource object.", "schema": { "$ref": "#/definitions/OrderItemResource" } @@ -1079,7 +1093,7 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "UpdateOrderItem": { - "$ref": "./examples/OrderItemUpdate.json" + "$ref": "./examples/UpdateOrderItem.json" } } } @@ -1136,7 +1150,7 @@ }, "x-ms-examples": { "CancelOrderItem": { - "$ref": "./examples/OrderItemCancel.json" + "$ref": "./examples/CancelOrderItem.json" } } } @@ -1194,26 +1208,15 @@ "x-ms-long-running-operation": true, "x-ms-examples": { "ReturnOrderItem": { - "$ref": "./examples/OrderItemReturn.json" + "$ref": "./examples/ReturnOrderItem.json" } } } } }, "definitions": { - "AdditionalErrorInfo": { - "type": "object", - "properties": { - "type": { - "type": "string" - }, - "info": { - "type": "object" - } - } - }, "AddressDetails": { - "description": "Address details for an order.", + "description": "Address details for an order item.", "required": [ "forwardAddress" ], @@ -1332,13 +1335,15 @@ "Available", "ComingSoon", "Preview", - "Deprecated" + "Deprecated", + "Signup", + "Unavailable" ], "type": "string", "readOnly": true, "x-ms-enum": { "name": "AvailabilityStage", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Available", @@ -1355,6 +1360,14 @@ { "value": "Deprecated", "description": "Product is deprecated." + }, + { + "value": "Signup", + "description": "Product is available only on signup." + }, + { + "value": "Unavailable", + "description": "Product is not available." } ] } @@ -1375,7 +1388,7 @@ "readOnly": true, "x-ms-enum": { "name": "DisabledReason", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "None", @@ -1454,18 +1467,7 @@ }, "hierarchyInformation": { "$ref": "#/definitions/HierarchyInformation", - "description": "Hierarchy information of the product system.", - "readOnly": true - } - } - }, - "BillingModel": { - "description": "Model to represent the billing cycle", - "type": "object", - "properties": { - "model": { - "description": "String to represent the billing model", - "type": "string", + "description": "Hierarchy information of a product.", "readOnly": true } } @@ -1553,6 +1555,11 @@ "$ref": "#/definitions/Specification" }, "readOnly": true + }, + "dimensions": { + "$ref": "#/definitions/Dimensions", + "description": "Dimensions of the configuration", + "readOnly": true } } }, @@ -1623,6 +1630,7 @@ }, "emailList": { "description": "List of Email-ids to be notified about job progress.", + "uniqueItems": false, "type": "array", "items": { "type": "string" @@ -1668,13 +1676,14 @@ "description": "Represents Metering type (eg one-time or recurrent)", "enum": [ "OneTime", - "Recurring" + "Recurring", + "Adhoc" ], "type": "string", "readOnly": true, "x-ms-enum": { "name": "MeteringType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "OneTime", @@ -1683,6 +1692,10 @@ { "value": "Recurring", "description": "Recurring billing." + }, + { + "value": "Adhoc", + "description": "Adhoc billing." } ] } @@ -1707,7 +1720,7 @@ "readOnly": true, "x-ms-enum": { "name": "DescriptionType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Base", @@ -1764,13 +1777,107 @@ "type": "string", "readOnly": true }, - "deviceHistory": { - "description": "Device history", - "uniqueItems": false, - "type": "array", - "items": { - "type": "string" - }, + "managementResourceId": { + "description": "Management Resource Id", + "type": "string", + "readOnly": true + } + } + }, + "Dimensions": { + "description": "Dimensions of a configuration.", + "type": "object", + "properties": { + "length": { + "description": "Length of the device.", + "type": "number", + "format": "double", + "readOnly": true + }, + "height": { + "description": "Height of the device.", + "type": "number", + "format": "double", + "readOnly": true + }, + "width": { + "description": "Width of the device.", + "type": "number", + "format": "double", + "readOnly": true + }, + "lengthHeightUnit": { + "description": "Unit for the dimensions of length, height and width.", + "enum": [ + "IN", + "CM" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "LengthHeightUnit", + "modelAsString": true, + "values": [ + { + "value": "IN", + "description": "Inch, applicable for West US." + }, + { + "value": "CM", + "description": "Centimeter." + } + ] + } + }, + "weight": { + "description": "Weight of the device.", + "type": "number", + "format": "double", + "readOnly": true + }, + "depth": { + "description": "Depth of the device.", + "type": "number", + "format": "double", + "readOnly": true + }, + "weightUnit": { + "description": "Unit for the dimensions of weight.", + "enum": [ + "LBS", + "KGS" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "WeightMeasurementUnit", + "modelAsString": true, + "values": [ + { + "value": "LBS", + "description": "Pounds." + }, + { + "value": "KGS", + "description": "Kilograms." + } + ] + } + } + } + }, + "DisplayInfo": { + "description": "Describes product display information", + "type": "object", + "properties": { + "productFamilyDisplayName": { + "description": "Product family display name", + "type": "string", + "readOnly": true + }, + "configurationDisplayName": { + "description": "Configuration display name", + "type": "string", "readOnly": true } } @@ -1788,7 +1895,7 @@ "type": "string", "x-ms-enum": { "name": "DoubleEncryptionStatus", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Disabled", @@ -1799,12 +1906,13 @@ "description": "Double encryption is enabled" } ] - } + }, + "default": "Disabled" } } }, "FilterableProperty": { - "description": "Class defining the list of filter values on a filter type as part of configuration request.", + "description": "Different types of filters supported and its values.", "required": [ "type", "supportedValues" @@ -1820,7 +1928,7 @@ "type": "string", "x-ms-enum": { "name": "SupportedFilterTypes", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "ShipToCountries", @@ -1880,7 +1988,7 @@ "readOnly": true, "x-ms-enum": { "name": "ImageType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "MainImage", @@ -1922,7 +2030,7 @@ "readOnly": true, "x-ms-enum": { "name": "LinkType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Generic", @@ -1958,21 +2066,21 @@ } } }, - "ManagementResourceDetails": { - "description": "Management resource details to link device", + "ManagementResourcePreferences": { + "description": "Management resource preference to link device", "type": "object", - "required": [ - "managementResourceArmId" - ], "properties": { - "managementResourceArmId": { - "description": "Management resource ARM ID", + "preferredManagementResourceId": { + "description": "Customer preferred Management resource ARM ID", "type": "string" } } }, "MeterDetails": { "description": "Holds details about billing type and its meter guids", + "required": [ + "billingType" + ], "type": "object", "properties": { "billingType": { @@ -1982,18 +2090,17 @@ "Purchase" ], "type": "string", - "readOnly": true, "x-ms-enum": { "name": "BillingType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Pav2", - "description": "Pav2 billing type." + "description": "PaV2 billing." }, { "value": "Purchase", - "description": "Purchase billing type." + "description": "Purchase billing." } ] } @@ -2014,7 +2121,7 @@ "readOnly": true, "x-ms-enum": { "name": "ChargingType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "PerOrder", @@ -2028,7 +2135,7 @@ } } }, - "x-ms-discriminator-value": "billingType" + "discriminator": "billingType" }, "NotificationPreference": { "description": "Notification preference for a job stage.", @@ -2041,41 +2148,21 @@ "stageName": { "description": "Name of the stage.", "enum": [ - "DevicePrepared", "Shipped", - "Delivered", - "PickedUp", - "AtAzureDC", - "DataCopy" + "Delivered" ], "type": "string", "x-ms-enum": { "name": "NotificationStageName", - "modelAsExtensible": true, + "modelAsString": true, "values": [ - { - "value": "DevicePrepared", - "description": "Notification at device prepared stage." - }, { "value": "Shipped", - "description": "Notification at device dispatched stage." + "description": "Notification at order item shipped from microsoft datacenter." }, { "value": "Delivered", - "description": "Notification at device delivered stage." - }, - { - "value": "PickedUp", - "description": "Notification at device picked up from user stage." - }, - { - "value": "AtAzureDC", - "description": "Notification at device received at Azure datacenter stage." - }, - { - "value": "DataCopy", - "description": "Notification at data copy started stage." + "description": "Notification at order item delivered to customer." } ] } @@ -2179,7 +2266,7 @@ "type": "string", "x-ms-enum": { "name": "OrderItemType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Purchase", @@ -2234,7 +2321,7 @@ "readOnly": true }, "cancellationStatus": { - "description": "Describes whether the order is cancellable or not.", + "description": "Describes whether the orderItem is cancellable or not.", "enum": [ "Cancellable", "CancellableWithFee", @@ -2244,7 +2331,7 @@ "readOnly": true, "x-ms-enum": { "name": "OrderItemCancellationEnum", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Cancellable", @@ -2271,7 +2358,7 @@ "readOnly": true, "x-ms-enum": { "name": "ActionStatusEnum", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Allowed", @@ -2290,7 +2377,7 @@ "readOnly": true }, "returnStatus": { - "description": "Describes whether the order item is returnable or not.", + "description": "Describes whether the orderItem is returnable or not.", "enum": [ "Returnable", "ReturnableWithFee", @@ -2300,7 +2387,7 @@ "readOnly": true, "x-ms-enum": { "name": "OrderItemReturnEnum", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "Returnable", @@ -2322,10 +2409,6 @@ "description": "parent RP details", "readOnly": true }, - "managementResourceDetails": { - "$ref": "#/definitions/ManagementResourceDetails", - "description": "Management resource details" - }, "error": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail", "description": "Top level error for the job.", @@ -2348,7 +2431,7 @@ }, "addressDetails": { "$ref": "#/definitions/AddressDetails", - "description": "Represents shipping and return address for order" + "description": "Represents shipping and return address for order item" }, "startTime": { "format": "date-time", @@ -2357,7 +2440,7 @@ "readOnly": true }, "orderId": { - "description": "Id of the order to which order items belongs to", + "description": "Id of the order to which order item belongs to", "type": "string" } } @@ -2387,7 +2470,7 @@ } }, "OrderResourceList": { - "description": "List of orders", + "description": "List of orders.", "type": "object", "properties": { "value": { @@ -2406,11 +2489,11 @@ } }, "StageDetails": { - "description": "Resource stage details", + "description": "Resource stage details.", "type": "object", "properties": { "stageStatus": { - "description": "Stage status", + "description": "Stage status.", "enum": [ "None", "InProgress", @@ -2423,7 +2506,7 @@ "readOnly": true, "x-ms-enum": { "name": "StageStatus", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "None", @@ -2455,80 +2538,25 @@ "stageName": { "description": "Stage name", "enum": [ - "DeviceOrdered", - "DevicePrepared", - "PickedUp", - "AtAzureDC", - "DataCopy", - "Completed", - "CompletedWithErrors", - "Cancelled", - "Aborted", - "CompletedWithWarnings", - "ReadyToDispatchFromAzureDC", - "ReadyToReceiveAtAzureDC", "Placed", "InReview", "Confirmed", - "ReadyForDispatch", + "ReadyToShip", "Shipped", "Delivered", - "InUse" + "InUse", + "ReturnInitiated", + "ReturnPickedUp", + "ReturnedToMicrosoft", + "ReturnCompleted", + "Cancelled" ], "type": "string", "readOnly": true, "x-ms-enum": { "name": "StageName", - "modelAsExtensible": true, + "modelAsString": true, "values": [ - { - "value": "DeviceOrdered", - "description": "An order has been created." - }, - { - "value": "DevicePrepared", - "description": "A device has been prepared for the order." - }, - { - "value": "PickedUp", - "description": "Device has been picked up from user and in transit to Azure datacenter." - }, - { - "value": "AtAzureDC", - "description": "Device has been received at Azure datacenter from the user." - }, - { - "value": "DataCopy", - "description": "Data copy from the device at Azure datacenter." - }, - { - "value": "Completed", - "description": "Order has completed." - }, - { - "value": "CompletedWithErrors", - "description": "Order has completed with errors." - }, - { - "value": "Cancelled", - "description": "Order has been cancelled." - }, - { - "value": "Aborted", - "description": "Order has been aborted." - }, - { - "value": "CompletedWithWarnings", - "description": "Order has completed with warnings." - }, - { - "value": "ReadyToDispatchFromAzureDC", - "description": "Device is ready to be handed to customer from Azure DC." - }, - { - "value": "ReadyToReceiveAtAzureDC", - "description": "Device can be dropped off at Azure DC." - }, { "value": "Placed", "description": "Currently in draft mode and can still be cancelled" @@ -2542,8 +2570,8 @@ "description": "Order is confirmed" }, { - "value": "ReadyForDispatch", - "description": "Order is ready for dispatch" + "value": "ReadyToShip", + "description": "Order is ready to ship" }, { "value": "Shipped", @@ -2556,6 +2584,26 @@ { "value": "InUse", "description": "Order is in use at customer site" + }, + { + "value": "ReturnInitiated", + "description": "Return has been initiated by customer." + }, + { + "value": "ReturnPickedUp", + "description": "Order is in transit from customer to microsoft." + }, + { + "value": "ReturnedToMicrosoft", + "description": "Order has been received back to microsoft." + }, + { + "value": "ReturnCompleted", + "description": "Return has now completed." + }, + { + "value": "Cancelled", + "description": "Order has been cancelled." } ] } @@ -2604,7 +2652,7 @@ "description": "Customer preference." }, "notificationEmailList": { - "description": "Customer preference.", + "description": "Additional notification email list.", "uniqueItems": false, "type": "array", "items": { @@ -2615,6 +2663,9 @@ }, "Pav2MeterDetails": { "description": "Billing type PAV2 meter details", + "required": [ + "billingType" + ], "type": "object", "allOf": [ { @@ -2649,6 +2700,10 @@ "encryptionPreferences": { "$ref": "#/definitions/EncryptionPreferences", "description": "Preferences related to the Encryption." + }, + "managementResourcePreferences": { + "$ref": "#/definitions/ManagementResourcePreferences", + "description": "Preferences related to the Management resource." } } }, @@ -2671,9 +2726,13 @@ ], "type": "object", "properties": { + "displayInfo": { + "$ref": "#/definitions/DisplayInfo", + "description": "Display details of the product" + }, "hierarchyInformation": { "$ref": "#/definitions/HierarchyInformation", - "description": " Hierarchy of the product which uniquely identifies the product" + "description": "Hierarchy of the product which uniquely identifies the product" }, "count": { "format": "int32", @@ -2852,6 +2911,9 @@ }, "PurchaseMeterDetails": { "description": "Billing type Purchase meter details", + "required": [ + "billingType" + ], "type": "object", "allOf": [ { @@ -2973,7 +3035,7 @@ "type": "string", "x-ms-enum": { "name": "AddressType", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "None", @@ -3089,7 +3151,7 @@ "type": "string", "x-ms-enum": { "name": "TransportShipmentTypes", - "modelAsExtensible": true, + "modelAsString": true, "values": [ { "value": "CustomerManaged", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json similarity index 84% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json index 4776fefb2196..c4fbeba689e0 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json @@ -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" diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressCreate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json similarity index 86% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressCreate.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json index 65d2dc2eb577..7091395ecc29 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressCreate.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json @@ -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": { @@ -33,10 +30,10 @@ }, "contactDetails": { "contactName": "Petr Cech", - "phone": "123344334", + "phone": "1234567890", "phoneExtension": "", "emailList": [ - "ssemcr@microsoft.com" + "testemail@microsoft.com" ] } }, @@ -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" ] } }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json similarity index 73% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json index 745a4512e6de..3e016c585720 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json @@ -14,7 +14,7 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "1388" + "1358" ], "orderItemResource": { "properties": { @@ -22,10 +22,10 @@ "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": { @@ -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" @@ -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": { @@ -112,8 +123,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -130,7 +141,7 @@ }, "contactDetails": { "contactName": "164 TOWNSEND ST", - "phone": "32131311", + "phone": "3213131190", "emailList": [ "ssemmail@microsoft.com", "vishwamdir@microsoft.com" @@ -138,7 +149,7 @@ } } }, - "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", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressDelete.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json similarity index 100% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressDelete.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json similarity index 100% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressGetByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json similarity index 93% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressGetByName.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json index 08cd6cc1d054..16cb0dde1138 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressGetByName.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json @@ -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" diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json index 738be350815f..82066cc1e357 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json @@ -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" } ] }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json similarity index 74% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json index 9257bae6e814..85de2d37da04 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json @@ -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": { @@ -57,8 +68,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -75,7 +86,7 @@ }, "contactDetails": { "contactName": "164 TOWNSEND ST", - "phone": "32131311", + "phone": "3213131190", "emailList": [ "ssemmail@microsoft.com", "vishwamdir@microsoft.com" @@ -83,7 +94,7 @@ } } }, - "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", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtResourceGrouplevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json similarity index 84% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtResourceGrouplevel.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json index fd6f2625938d..cbe1be06b530 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtResourceGrouplevel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json @@ -19,22 +19,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemmail@microsoft.com" ] } }, @@ -49,22 +46,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemmail@microsoft.com" ] } }, @@ -79,22 +73,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemmail@microsoft.com" ] } }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json similarity index 84% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtSubscriptionLevel.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json index 906cd01988d1..ac679cf1f5ee 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressesGetAtSubscriptionLevel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json @@ -18,22 +18,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemmail@microsoft.com" ] } }, @@ -48,22 +45,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemmail@microsoft.com" ] } }, @@ -78,22 +72,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": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "ssemcr@microsoft.com" ] } }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json index c5a992c23441..0c8ee5d37571 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json @@ -12,15 +12,15 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "498" + "396" ], "configurationsRequest": { "configurationFilters": [ { "hierarchyInformation": { - "productFamilyName": "azurestackedge", - "productLineName": "azure stack edge_pl", - "productName": "azure stack edge pro - gpu" + "productFamilyName": "AzureStackEdge", + "productLineName": "AzureStackEdge", + "productName": "AzureStackEdgeGPU" }, "filterableProperty": [ { @@ -28,12 +28,6 @@ "supportedValues": [ "US" ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Enabled" - ] } ] } @@ -48,50 +42,60 @@ "properties": { "specifications": [ { - "name": "Cores", - "value": "24" + "name": "Usable compute", + "value": "40 vCPU" }, { - "name": "Memory", - "value": "128 GB" + "name": "Usable memory", + "value": "102 GB" }, { - "name": "Storage", - "value": "~8 TB" + "name": "Usable storage", + "value": "4.2 TB" } ], + "dimensions": { + "length": 50.0, + "height": 15.0, + "width": 5.0, + "lengthHeightUnit": "IN", + "weight": 50.0, + "depth": 2.0, + "weightUnit": "LBS" + }, "filterableProperties": [ { "type": "ShipToCountries", "supportedValues": [ "US", - "UK" - ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Enabled" + "AR" ] } ], - "displayName": "azurestackedgepro-gpu 1 GPU", + "displayName": "Azure Stack Edge Pro - 1 GPU", "description": { "descriptionType": "Base", - "keywords": [], + "shortDescription": "", + "longDescription": "", + "keywords": [ + "GPU" + ], "attributes": [], "links": [] }, "imageInformation": [], + "costInformation": { + "billingMeterDetails": [] + }, "availabilityInformation": { "availabilityStage": "Available", "disabledReason": "None" }, "hierarchyInformation": { "productFamilyName": "azurestackedge", - "productLineName": "azure stack edge_pl", - "productName": "azure stack edge pro - gpu", - "configurationName": "azurestackedgepro-gpu1 gpu" + "productLineName": "azurestackedge", + "productName": "azurestackedgegpu", + "configurationName": "edgep_base" } } } diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json index 8cde9566cb92..eb2a98405b2a 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json @@ -71,9 +71,9 @@ "name": "Microsoft.EdgeOrder/locations/orders/read", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orders", - "operation": "List or Get ArmApiRes_orders", - "description": "List or get the ArmApiRes_orders" + "resource": "Order", + "operation": "List or Get Order", + "description": "List or get the Order" }, "origin": "user", "isDataAction": false @@ -82,9 +82,9 @@ "name": "Microsoft.EdgeOrder/orders/read", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orders", - "operation": "List or Get ArmApiRes_orders", - "description": "List or get the ArmApiRes_orders" + "resource": "Order", + "operation": "List or Get Order", + "description": "List or get the Order" }, "origin": "user", "isDataAction": false @@ -93,27 +93,31 @@ "name": "Microsoft.EdgeOrder/orderItems/cancel/action", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orderItems" + "resource": "OrderItem", + "operation": "Cancel OrderItem", + "description": "Cancels an OrderItem in progress." }, "origin": "user", - "isDataAction": true + "isDataAction": false }, { "name": "Microsoft.EdgeOrder/orderItems/return/action", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orderItems" + "resource": "OrderItem", + "operation": "Return OrderItem", + "description": "Return an OrderItem." }, "origin": "user", - "isDataAction": true + "isDataAction": false }, { "name": "Microsoft.EdgeOrder/orderItems/read", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orderItems", - "operation": "List or Get ArmApiRes_orderItems", - "description": "List or get the ArmApiRes_orderItems" + "resource": "OrderItem", + "operation": "List or Get OrderItem", + "description": "List or get the OrderItem" }, "origin": "user", "isDataAction": false @@ -122,9 +126,9 @@ "name": "Microsoft.EdgeOrder/orderItems/delete", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orderItems", - "operation": "Delete ArmApiRes_orderItems", - "description": "Delete the ArmApiRes_orderItems" + "resource": "OrderItem", + "operation": "Delete OrderItem", + "description": "Delete the OrderItem" }, "origin": "user", "isDataAction": false @@ -133,9 +137,9 @@ "name": "Microsoft.EdgeOrder/orderItems/write", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_orderItems", - "operation": "Create or Update ArmApiRes_orderItems", - "description": "Create or update the ArmApiRes_orderItems" + "resource": "OrderItem", + "operation": "Create or Update OrderItem", + "description": "Create or update the OrderItem" }, "origin": "user", "isDataAction": false @@ -144,28 +148,34 @@ "name": "Microsoft.EdgeOrder/productFamiliesMetadata/action", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_Microsoft.EdgeOrder" + "resource": "ArmApiRes_Microsoft.EdgeOrder", + "operation": "List or Get product families metadata", + "description": "This method lists or gets the product families metadata." }, "origin": "user", - "isDataAction": true + "isDataAction": false }, { "name": "Microsoft.EdgeOrder/listProductFamilies/read", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_Microsoft.EdgeOrder" + "resource": "ArmApiRes_Microsoft.EdgeOrder", + "operation": "List Product Families", + "description": "This method returns list of product families." }, "origin": "user", - "isDataAction": true + "isDataAction": false }, { "name": "Microsoft.EdgeOrder/listConfigurations/action", "display": { "provider": "Edge Ordering", - "resource": "ArmApiRes_Microsoft.EdgeOrder" + "resource": "ArmApiRes_Microsoft.EdgeOrder", + "operation": "List Product Configurations", + "description": "This method returns list of product configurations." }, "origin": "user", - "isDataAction": true + "isDataAction": false } ] } diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json index 7654a1353a00..8a1964ba7fc7 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json @@ -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-07T13:13:35.0789537+05:30" }, "orderStageHistory": [ { - "stageStatus": "None", - "stageName": "InReview" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:08:16.3198555+05:30" }, { - "stageStatus": "None", - "stageName": "Placed" - }, - { - "stageStatus": "None", - "stageName": "Confirmed" + "stageStatus": "Succeeded", + "stageName": "InReview", + "startTime": "2021-06-07T13:13:35.0789537+05:30" } ] }, @@ -49,22 +47,20 @@ "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01" ], "currentStage": { - "stageStatus": "InProgress", + "stageStatus": "Succeeded", "stageName": "InReview", - "startTime": "0001-01-01T05:30:00+05:30" + "startTime": "2021-06-07T13:19:40.9984759+05:30" }, "orderStageHistory": [ { - "stageStatus": "None", - "stageName": "InReview" - }, - { - "stageStatus": "None", - "stageName": "Placed" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:14:39.9413253+05:30" }, { - "stageStatus": "None", - "stageName": "Confirmed" + "stageStatus": "Succeeded", + "stageName": "InReview", + "startTime": "2021-06-07T13:19:40.9984759+05:30" } ] }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json index e9088e13d141..8cae0bc5af33 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json @@ -19,22 +19,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-07T13:13:35.0789537+05:30" }, "orderStageHistory": [ { - "stageStatus": "None", - "stageName": "InReview" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:08:16.3198555+05:30" }, { - "stageStatus": "None", - "stageName": "Placed" - }, - { - "stageStatus": "None", - "stageName": "Confirmed" + "stageStatus": "Succeeded", + "stageName": "InReview", + "startTime": "2021-06-07T13:13:35.0789537+05:30" } ] }, @@ -48,22 +46,20 @@ "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01" ], "currentStage": { - "stageStatus": "InProgress", + "stageStatus": "Succeeded", "stageName": "InReview", - "startTime": "0001-01-01T05:30:00+05:30" + "startTime": "2021-06-07T13:19:40.9984759+05:30" }, "orderStageHistory": [ { - "stageStatus": "None", - "stageName": "InReview" - }, - { - "stageStatus": "None", - "stageName": "Placed" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:14:39.9413253+05:30" }, { - "stageStatus": "None", - "stageName": "Confirmed" + "stageStatus": "Succeeded", + "stageName": "InReview", + "startTime": "2021-06-07T13:19:40.9984759+05:30" } ] }, diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetByRG.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json similarity index 70% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetByRG.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json index 58b12efd0a25..a453c1898744 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetByRG.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json @@ -18,37 +18,49 @@ "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:13:04.0758106+05:30" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:29:33.9791927+05:30" }, "orderItemStageHistory": [ + { + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:29:33.9791927+05:30" + }, { "stageStatus": "None", - "stageName": "InReview" + "stageName": "Confirmed" }, { "stageStatus": "None", - "stageName": "Placed" + "stageName": "ReadyToShip" }, { "stageStatus": "None", - "stageName": "Confirmed" + "stageName": "Shipped" }, { "stageStatus": "None", - "stageName": "ReadyForDispatch" + "stageName": "Delivered" + }, + { + "stageStatus": "None", + "stageName": "InUse" } ], "preferences": { @@ -58,8 +70,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -76,7 +88,7 @@ }, "contactDetails": { "contactName": "164 TOWNSEND ST", - "phone": "32131311", + "phone": "3213131190", "emailList": [ "ssemmail@microsoft.com", "vishwamdir@microsoft.com" @@ -84,7 +96,7 @@ } } }, - "startTime": "2021-03-24T15:13:04.0758106+05:30", + "startTime": "2021-06-07T12:29:25.6656282+05:30", "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901" }, "location": "westus", @@ -100,37 +112,49 @@ "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" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:49:48.8869361+05:30" }, "orderItemStageHistory": [ + { + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:31:07.7430555+05:30" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, { "stageStatus": "None", - "stageName": "InReview" + "stageName": "ReadyToShip" }, { "stageStatus": "None", - "stageName": "Placed" + "stageName": "Shipped" }, { "stageStatus": "None", - "stageName": "Confirmed" + "stageName": "Delivered" }, { "stageStatus": "None", - "stageName": "ReadyForDispatch" + "stageName": "InUse" } ], "preferences": { @@ -140,8 +164,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -166,7 +190,7 @@ } } }, - "startTime": "2021-03-24T15:17:13.1376775+05:30", + "startTime": "2021-06-07T12:31:06.1244193+05:30", "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" }, "location": "westus", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetBySubscription.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json similarity index 69% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetBySubscription.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json index 672cd69fff94..744cc6c30d9f 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetBySubscription.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json @@ -17,37 +17,49 @@ "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:13:04.0758106+05:30" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:29:33.9791927+05:30" }, "orderItemStageHistory": [ + { + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:29:33.9791927+05:30" + }, { "stageStatus": "None", - "stageName": "InReview" + "stageName": "Confirmed" }, { "stageStatus": "None", - "stageName": "Placed" + "stageName": "ReadyToShip" }, { "stageStatus": "None", - "stageName": "Confirmed" + "stageName": "Shipped" }, { "stageStatus": "None", - "stageName": "ReadyForDispatch" + "stageName": "Delivered" + }, + { + "stageStatus": "None", + "stageName": "InUse" } ], "preferences": { @@ -57,8 +69,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -75,15 +87,14 @@ }, "contactDetails": { "contactName": "164 TOWNSEND ST", - "phone": "32131311", + "phone": "3213131190", "emailList": [ - "ssemmail@microsoft.com", - "vishwamdir@microsoft.com" + "testemail@microsoft.com" ] } } }, - "startTime": "2021-03-24T15:13:04.0758106+05:30", + "startTime": "2021-06-07T12:29:25.6656282+05:30", "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901" }, "location": "westus", @@ -99,37 +110,49 @@ "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" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:49:48.8869361+05:30" }, "orderItemStageHistory": [ + { + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T12:31:07.7430555+05:30" + }, { "stageStatus": "None", - "stageName": "InReview" + "stageName": "Confirmed" }, { "stageStatus": "None", - "stageName": "Placed" + "stageName": "ReadyToShip" }, { "stageStatus": "None", - "stageName": "Confirmed" + "stageName": "Shipped" + }, + { + "stageStatus": "None", + "stageName": "Delivered" }, { "stageStatus": "None", - "stageName": "ReadyForDispatch" + "stageName": "InUse" } ], "preferences": { @@ -139,8 +162,8 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { @@ -165,7 +188,7 @@ } } }, - "startTime": "2021-03-24T15:17:13.1376775+05:30", + "startTime": "2021-06-07T12:31:06.1244193+05:30", "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" }, "location": "westus", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json index 38b2fd23a071..93dc08d1792e 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json @@ -12,7 +12,7 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "174" + "181" ], "productFamiliesRequest": { "filterableProperties": { @@ -20,8 +20,7 @@ { "type": "ShipToCountries", "supportedValues": [ - "US", - "UK" + "US" ] } ] @@ -45,50 +44,59 @@ "properties": { "specifications": [ { - "name": "Cores", - "value": "24" + "name": "Usable compute", + "value": "40 vCPU" }, { - "name": "Memory", - "value": "128 GB" + "name": "Usable memory", + "value": "102 GB" }, { - "name": "Storage", - "value": "~8 TB" + "name": "Usable storage", + "value": "4.2 TB" } ], + "dimensions": { + "length": 50.0, + "height": 15.0, + "width": 5.0, + "lengthHeightUnit": "IN", + "weight": 50.0, + "depth": 2.0, + "weightUnit": "LBS" + }, "filterableProperties": [ { "type": "ShipToCountries", "supportedValues": [ - "US", - "UK" - ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Disabled" + "US" ] } ], - "displayName": "Azure Stack Edge Pro - R 3 GPU", + "displayName": "Azure Stack Edge Pro - 1 GPU", "description": { "descriptionType": "Base", - "keywords": [], + "shortDescription": "", + "longDescription": "", + "keywords": [ + "GPU" + ], "attributes": [], "links": [] }, "imageInformation": [], + "costInformation": { + "billingMeterDetails": [] + }, "availabilityInformation": { "availabilityStage": "Available", "disabledReason": "None" }, "hierarchyInformation": { "productFamilyName": "azurestackedge", - "productLineName": "azure stack edge_pl", - "productName": "azure stack edge pro - r", - "configurationName": "azure stack edge pro - r 3 gpu" + "productLineName": "azurestackedge", + "productName": "azurestackedgegpu", + "configurationName": "edgep_base" } } } @@ -97,69 +105,51 @@ { "type": "ShipToCountries", "supportedValues": [ - "US", - "UK" - ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Enabled" + "US" ] } ], - "displayName": "Azure Stack Edge Pro - R", + "displayName": "Azure Stack Edge Pro - GPU", "description": { "descriptionType": "Base", - "shortDescription": "Rugged physical edge compute device", - "longDescription": "Azure Stack Edge is an AI-enabled edge computing device with network data transfer capabilities. The device is powered with Intel Aria to provide accelerated AI inferencing at the edge. You can choose from the available configurations with one or two FPGAs basis your business need", + "shortDescription": "Azure managed physical edge compute device", + "longDescription": "Azure Stack Edge is an AI-enabled edge computing device with network data transfer capabilities. The device is powered with NVIDIA T4 GPUs to provide accelerated AI inferencing at the edge. You can choose from the available configurations with one or two GPUs basis your business need", "keywords": [ - "Edge", - "FPGA" + "GPU" ], "attributes": [ - "1U device shipped by Microsoft", - "Hardware accelerated ML using Intel ARIA FPGA" + "1U rack mount device with network data transfer capabilities", + "Hardware accelerated ML using Nvidia T4 GPU", + "Azure Private Edge Zones enabled" ], "links": [ + { + "linkType": "Specification", + "linkUrl": "https://aka.ms/ase-gpu-devicespecs" + }, + { + "linkType": "Generic", + "linkUrl": "https://aka.ms/ase-gpu-billing" + }, { "linkType": "TermsAndConditions", - "linkUrl": "https://aka.mx/tc" + "linkUrl": "https://aka.ms/ase-gpu-product-terms" }, { "linkType": "KnowMore", - "linkUrl": "https://aka.mx/knowmore" + "linkUrl": "https://aka.ms/ase-documentation" } ] }, - "imageInformation": [ - { - "imageType": "MainImage", - "imageUrl": "https://xyz.com" - }, - { - "imageType": "BulletImage", - "imageUrl": "https://abc.com" - }, - { - "imageType": "GenericImage", - "imageUrl": "https://xyz.com/1" - }, - { - "imageType": "GenericImage", - "imageUrl": "https://abc.com/1" - } - ], - "costInformation": {}, + "imageInformation": [], "availabilityInformation": { - "availabilityStage": "ComingSoon", - "disabledReason": "NotAvailable", - "disabledReasonMessage": "Device is not available yet" + "availabilityStage": "Available", + "disabledReason": "None" }, "hierarchyInformation": { "productFamilyName": "azurestackedge", - "productLineName": "azure stack edge_pl", - "productName": "azure stack edge pro - r", + "productLineName": "azurestackedge", + "productName": "azurestackedgegpu", "configurationName": "" } } @@ -169,18 +159,11 @@ { "type": "ShipToCountries", "supportedValues": [ - "US", - "UK" - ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Enabled" + "US" ] } ], - "displayName": "Azure Stack Edge_Pl", + "displayName": "Azure Stack Edge", "description": { "descriptionType": "Base", "keywords": [], @@ -194,28 +177,13 @@ }, "hierarchyInformation": { "productFamilyName": "azurestackedge", - "productLineName": "azure stack edge_pl", + "productLineName": "azurestackedge", "productName": "", "configurationName": "" } } } ], - "filterableProperties": [ - { - "type": "ShipToCountries", - "supportedValues": [ - "US", - "UK" - ] - }, - { - "type": "DoubleEncryptionStatus", - "supportedValues": [ - "Enabled" - ] - } - ], "displayName": "Azure Stack Edge", "description": { "descriptionType": "Base", diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json index 67240b8f6d75..5aadcaf2d601 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json @@ -15,6 +15,21 @@ "value": [ { "properties": { + "productLines": [], + "filterableProperties": [ + { + "type": "ShipToCountries", + "supportedValues": [ + "US" + ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Enabled" + ] + } + ], "displayName": "Azure Stack Edge", "description": { "descriptionType": "Base", @@ -23,20 +38,16 @@ "links": [] }, "imageInformation": [], - "costInformation": {}, "availabilityInformation": { "availabilityStage": "Available", "disabledReason": "None" }, - "filterableProperties": [ - { - "type": "ShipToCountries", - "supportedValues": [ - "US", - "UK" - ] - } - ] + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "", + "productName": "", + "configurationName": "" + } } } ] diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemReturn.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json similarity index 100% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemReturn.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressPatch.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json similarity index 94% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressPatch.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json index 1a80d21622ca..d97d12d9ceae 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/AddressPatch.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json @@ -14,7 +14,7 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "611" + "612" ], "addressUpdateParameter": { "properties": { @@ -30,7 +30,7 @@ }, "contactDetails": { "contactName": "Petr Cech", - "phone": "123344335", + "phone": "1234567890", "phoneExtension": "", "emailList": [ "ssemcr@microsoft.com" @@ -52,18 +52,16 @@ "shippingAddress": { "streetAddress1": "16 TOWNSEND STT", "streetAddress2": "UNIT 1", - "streetAddress3": "", "city": "San Francisco", "stateOrProvince": "CA", "country": "US", "postalCode": "94107", - "zipExtendedCode": "", "companyName": "Microsoft", "addressType": "None" }, "contactDetails": { "contactName": "Petr Cech", - "phone": "123344335", + "phone": "1234567890", "phoneExtension": "", "emailList": [ "ssemcr@microsoft.com" diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemUpdate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json similarity index 65% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemUpdate.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json index 7d6e178ba412..e2103d6a1000 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemUpdate.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json @@ -14,14 +14,14 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "493" + "533" ], "orderItemUpdateParameter": { "properties": { "forwardAddress": { "contactDetails": { "contactName": "Updated contact name", - "phone": "22222", + "phone": "2222200000", "emailList": [ "testemail@microsoft.com" ] @@ -46,37 +46,49 @@ "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" + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:14:40.0815406+05:30" }, "orderItemStageHistory": [ + { + "stageStatus": "Succeeded", + "stageName": "Placed", + "startTime": "2021-06-07T13:14:40.0815406+05:30" + }, { "stageStatus": "None", - "stageName": "InReview" + "stageName": "Confirmed" }, { "stageStatus": "None", - "stageName": "Placed" + "stageName": "ReadyToShip" }, { "stageStatus": "None", - "stageName": "Confirmed" + "stageName": "Shipped" }, { "stageStatus": "None", - "stageName": "ReadyForDispatch" + "stageName": "Delivered" + }, + { + "stageStatus": "None", + "stageName": "InUse" } ], "preferences": { @@ -86,21 +98,32 @@ }, "notificationEmailList": [], "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnStatus": "Returnable" + "deletionStatus": "NotAllowed", + "returnStatus": "NotReturnable" }, "addressDetails": { "forwardAddress": { + "shippingAddress": { + "streetAddress1": "16 TOWNSEND ST", + "streetAddress2": "UNIT 1", + "city": "San Francisco", + "stateOrProvince": "CA", + "country": "US", + "postalCode": "94107", + "zipExtendedCode": "1", + "companyName": "Microsoft", + "addressType": "Residential" + }, "contactDetails": { "contactName": "Updated contact name", - "phone": "22222", + "phone": "2222200000", "emailList": [ "testemail@microsoft.com" ] } } }, - "startTime": "2021-03-24T15:17:13.1376775+05:30", + "startTime": "2021-06-07T13:14:37.4649597+05:30", "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" }, "location": "westus", diff --git a/specification/edgeorder/resource-manager/readme.go.md b/specification/edgeorder/resource-manager/readme.go.md new file mode 100644 index 000000000000..cc32eb1019e9 --- /dev/null +++ b/specification/edgeorder/resource-manager/readme.go.md @@ -0,0 +1,26 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +``` yaml $(go) +go: + license-header: MICROSOFT_MIT_NO_VERSION + clear-output-folder: true + namespace: edgeorder +``` + +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2020-12-preview +``` + +### Tag: package-2020-12-preview and go + +These settings apply only when `--tag=package-2020-12-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2020-12-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-12-01-preview/$(namespace) +``` \ No newline at end of file diff --git a/specification/edgeorder/resource-manager/readme.md b/specification/edgeorder/resource-manager/readme.md index f20620ade6ec..b35e7a45fbe2 100644 --- a/specification/edgeorder/resource-manager/readme.md +++ b/specification/edgeorder/resource-manager/readme.md @@ -25,7 +25,8 @@ To see additional help and options, run: These are the global settings for the EdgeOrder API. ``` yaml -title: Edge Order API's +title: EdgeOrderManagementClient +description: Edge Order API's openapi-type: arm tag: package-2020-12-preview ``` @@ -38,4 +39,40 @@ These settings apply only when `--tag=package-2020-12-preview` is specified on t input-file: - Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json ``` ---- \ No newline at end of file +--- +# Code Generation + + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +``` yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-net + - repo: azure-sdk-for-python-track2 + - repo: azure-sdk-for-go +``` + +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.Azure.Management.EdgeOrder + output-folder: $(csharp-sdks-folder)/edgeorder/Microsoft.Azure.Management.EdgeOrder/src/Generated + clear-output-folder: true +``` + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## Go + +See configuration in [readme.go.md](./readme.go.md) \ No newline at end of file diff --git a/specification/edgeorder/resource-manager/readme.python.md b/specification/edgeorder/resource-manager/readme.python.md new file mode 100644 index 000000000000..91a7c02645b3 --- /dev/null +++ b/specification/edgeorder/resource-manager/readme.python.md @@ -0,0 +1,24 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. +Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. +These settings apply only when `--track2` is specified on the command line. + +``` yaml $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-edgeorder +no-namespace-folders: true +package-version: 1.0.0b1 +clear-output-folder: true +``` + +```yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder +``` + +```yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/edgeorder/azure-mgmt-edgeorder \ No newline at end of file