From 530cb1763f4999b79c9e4d24647c4d85c4030e75 Mon Sep 17 00:00:00 2001 From: sashanm <54701252+sashanm@users.noreply.github.com> Date: Fri, 26 Mar 2021 11:17:22 +0530 Subject: [PATCH] new api changes (#1) (#13612) * new api changes * referer url change --- .../preview/2020-12-01-preview/edgeorder.json | 1032 +++++++++-------- .../examples/AddressCreate.json | 10 +- .../examples/AddressGetByName.json | 5 +- .../examples/AddressPatch.json | 10 +- .../AddressesGetAtResourceGrouplevel.json | 18 +- .../AddressesGetAtSubscriptionLevel.json | 18 +- .../examples/GetOrderByName.json | 48 + .../examples/ListConfigurations.json | 46 +- .../examples/ListOperations.json | 87 +- .../ListOrderAtResourceGroupLevel.json | 79 ++ .../ListOrderAtSubscriptionLevel.json | 78 ++ .../examples/ListProductFamilies.json | 300 ++--- .../examples/ListProductFamiliesMetadata.json | 27 +- .../examples/OrderCollectionCreate.json | 54 - .../examples/OrderCollectionDelete.json | 19 - .../examples/OrderCollectionGet.json | 34 - .../OrderCollectionListAtRGLevel.json | 37 - ...rderCollectionListAtSubscriptionLevel.json | 36 - .../examples/OrderCollectionUpdate.json | 49 - .../examples/OrderCreate.json | 105 -- .../2020-12-01-preview/examples/OrderGet.json | 69 -- .../examples/OrderGetByRG.json | 72 -- .../examples/OrderGetBySubscription.json | 71 -- ...{OrderCancel.json => OrderItemCancel.json} | 2 +- .../examples/OrderItemCreate.json | 156 +++ ...{OrderDelete.json => OrderItemDelete.json} | 6 +- .../examples/OrderItemGet.json | 100 ++ .../examples/OrderItemGetByRG.json | 185 +++ .../examples/OrderItemGetBySubscription.json | 184 +++ ...{OrderReturn.json => OrderItemReturn.json} | 6 +- .../examples/OrderItemUpdate.json | 119 ++ .../examples/OrderUpdate.json | 91 -- 32 files changed, 1721 insertions(+), 1432 deletions(-) create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionCreate.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionDelete.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionGet.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtRGLevel.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtSubscriptionLevel.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionUpdate.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCreate.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGet.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetByRG.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetBySubscription.json rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderCancel.json => OrderItemCancel.json} (94%) create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderDelete.json => OrderItemDelete.json} (80%) create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetByRG.json create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetBySubscription.json rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/{OrderReturn.json => OrderItemReturn.json} (80%) create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemUpdate.json delete mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderUpdate.json 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 1aa94ab49e3b..186bee071977 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 @@ -297,13 +297,13 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.EdgeOrder/orderCollections": { + "/subscriptions/{subscriptionId}/providers/Microsoft.EdgeOrder/orders": { "get": { "tags": [ - "OrderCollections" + "Orders" ], - "description": "Lists order collections at subscription level.", - "operationId": "ListOrderCollectionsAtSubscriptionLevel", + "description": "Lists order at subscription level.", + "operationId": "ListOrderAtSubscriptionLevel", "consumes": [ "application/json" ], @@ -320,16 +320,16 @@ { "name": "$skipToken", "in": "query", - "description": "$skipToken is supported on Get list of order collections, which provides the next page in the list of order collections.", + "description": "$skipToken is supported on Get list of order, which provides the next page in the list of order.", "required": false, "type": "string" } ], "responses": { "200": { - "description": "Order collection object", + "description": "Order object", "schema": { - "$ref": "#/definitions/OrderCollectionResourceList" + "$ref": "#/definitions/OrderResourceList" } }, "default": { @@ -343,19 +343,19 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "ListOrderCollectionsAtSubscriptionLevel": { - "$ref": "./examples/OrderCollectionListAtSubscriptionLevel.json" + "ListOrderAtSubscriptionLevel": { + "$ref": "./examples/ListOrderAtSubscriptionLevel.json" } } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.EdgeOrder/orders": { + "/subscriptions/{subscriptionId}/providers/Microsoft.EdgeOrder/orderItems": { "get": { "tags": [ - "Orders" + "OrderItems" ], "description": "Lists order at subscription level.", - "operationId": "ListOrdersAtSubscriptionLevel", + "operationId": "ListOrderItemsAtSubscriptionLevel", "consumes": [ "application/json" ], @@ -372,7 +372,7 @@ { "name": "$filter", "in": "query", - "description": "$filter is supported to filter based on order collection id. Filter supports only equals operation.", + "description": "$filter is supported to filter based on order id. Filter supports only equals operation.", "required": false, "type": "string" }, @@ -386,9 +386,9 @@ ], "responses": { "200": { - "description": "Order object", + "description": "Order item object", "schema": { - "$ref": "#/definitions/OrderResourceList" + "$ref": "#/definitions/OrderItemResourceList" } }, "default": { @@ -402,8 +402,8 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "ListOrdersAtSubscriptionLevel": { - "$ref": "./examples/OrderGetBySubscription.json" + "ListOrderItemsAtSubscriptionLevel": { + "$ref": "./examples/OrderItemGetBySubscription.json" } } } @@ -693,13 +693,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderCollections": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orders": { "get": { "tags": [ - "OrderCollections" + "Orders" ], - "description": "Lists order collections at resource group level.", - "operationId": "ListOrderCollectionsAtResourceGroupLevel", + "description": "Lists order at resource group level.", + "operationId": "ListOrderAtResourceGroupLevel", "consumes": [ "application/json" ], @@ -719,16 +719,16 @@ { "name": "$skipToken", "in": "query", - "description": "$skipToken is supported on Get list of order collections, which provides the next page in the list of order collections.", + "description": "$skipToken is supported on Get list of order, which provides the next page in the list of order.", "required": false, "type": "string" } ], "responses": { "200": { - "description": "Order collection object", + "description": "Order object", "schema": { - "$ref": "#/definitions/OrderCollectionResourceList" + "$ref": "#/definitions/OrderResourceList" } }, "default": { @@ -742,124 +742,19 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "ListOrderCollectionsAtResourceGroupLevel": { - "$ref": "./examples/OrderCollectionListAtRGLevel.json" + "ListOrderAtResourceGroupLevel": { + "$ref": "./examples/ListOrderAtResourceGroupLevel.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderCollections/{orderCollectionName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/locations/{location}/orders/{orderName}": { "get": { "tags": [ - "OrderCollections" - ], - "description": "Gets an order collection.", - "operationId": "GetOrderCollectionByName", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/orderCollectionNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Order collection object", - "schema": { - "$ref": "#/definitions/OrderCollectionResource" - } - }, - "default": { - "description": "Error response describing reason for operation failure.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "GetOrderCollectionByName": { - "$ref": "./examples/OrderCollectionGet.json" - } - } - }, - "put": { - "tags": [ - "OrderCollections" - ], - "description": "Creates an order collection. Existing order collection cannot be updated with this api and should instead be updated with the Update order collection API.", - "operationId": "CreateOrderCollection", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/orderCollectionNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "name": "orderCollectionResource", - "in": "body", - "description": "Order collection details from request body.", - "required": true, - "schema": { - "$ref": "#/definitions/OrderCollectionResource" - } - } - ], - "responses": { - "200": { - "description": "Returns order collection object", - "schema": { - "$ref": "#/definitions/OrderCollectionResource" - } - }, - "202": { - "description": "Accepted request to create order collection." - }, - "default": { - "description": "Error response describing reason for operation failure.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-examples": { - "CreateOrderCollection": { - "$ref": "./examples/OrderCollectionCreate.json" - } - } - }, - "delete": { - "tags": [ - "OrderCollections" + "Orders" ], - "description": "Deletes an order collection.", - "operationId": "DeleteOrderCollectionByName", + "description": "Gets an order.", + "operationId": "GetOrderByName", "consumes": [ "application/json" ], @@ -868,7 +763,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderCollectionNameParameter" + "$ref": "#/parameters/orderNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -877,83 +772,17 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Just for swagger we are adding this status code" - }, - "202": { - "description": "Accepted delete request for an order collection" - }, - "204": { - "description": "No content. Order collection deleted" - }, - "default": { - "description": "Error response describing reason for operation failure.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-examples": { - "DeleteOrderCollectionByName": { - "$ref": "./examples/OrderCollectionDelete.json" - } - } - }, - "patch": { - "tags": [ - "OrderCollections" - ], - "description": "Updates the properties of an existing order collection.", - "operationId": "UpdateOrderCollection", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/orderCollectionNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "name": "If-Match", - "in": "header", - "description": "Defines the If-Match condition. The patch will be performed only if the ETag of the order collection on the server matches this value.", - "required": false, - "type": "string" - }, - { - "name": "orderCollectionUpdateParameter", - "in": "body", - "description": "order collection update parameters from request body.", - "required": true, - "schema": { - "$ref": "#/definitions/OrderCollectionUpdateParameter" - } } ], "responses": { - "202": { - "description": "Accepted request for order collection update." - }, "200": { - "description": "Order collection object", + "description": "Order object", "schema": { - "$ref": "#/definitions/OrderCollectionResource" + "$ref": "#/definitions/OrderResource" } }, "default": { @@ -963,21 +792,20 @@ } } }, - "x-ms-long-running-operation": true, "x-ms-examples": { - "UpdateOrderCollection": { - "$ref": "./examples/OrderCollectionUpdate.json" + "GetOrderByName": { + "$ref": "./examples/GetOrderByName.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orders": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderItems": { "get": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Lists order at resource group level.", - "operationId": "ListOrdersAtResourceGroupLevel", + "description": "Lists order item at resource group level.", + "operationId": "ListOrderItemsAtResourceGroupLevel", "consumes": [ "application/json" ], @@ -997,23 +825,23 @@ { "name": "$filter", "in": "query", - "description": "$filter is supported to filter based on order collection id. Filter supports only equals operation.", + "description": "$filter is supported to filter based on order id. Filter supports only equals operation.", "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 object", + "description": "List of Order item object", "schema": { - "$ref": "#/definitions/OrderResourceList" + "$ref": "#/definitions/OrderItemResourceList" } }, "default": { @@ -1027,19 +855,19 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "ListOrdersAtResourceGroupLevel": { - "$ref": "./examples/OrderGetByRG.json" + "ListOrderItemsAtResourceGroupLevel": { + "$ref": "./examples/OrderItemGetByRG.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orders/{orderName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderItems/{orderItemName}": { "get": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Gets an order.", - "operationId": "GetOrderByName", + "description": "Gets an order item.", + "operationId": "GetOrderItemByName", "consumes": [ "application/json" ], @@ -1048,7 +876,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1062,9 +890,9 @@ ], "responses": { "200": { - "description": "Order object", + "description": "Order item object", "schema": { - "$ref": "#/definitions/OrderResource" + "$ref": "#/definitions/OrderItemResource" } }, "default": { @@ -1075,17 +903,17 @@ } }, "x-ms-examples": { - "GetOrderByName": { - "$ref": "./examples/OrderGet.json" + "GetOrderItemByName": { + "$ref": "./examples/OrderItemGet.json" } } }, "put": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Creates an order. Existing order cannot be updated with this api and should instead be updated with the Update order API.", - "operationId": "CreateOrder", + "description": "Creates an order item. Existing order item cannot be updated with this api and should instead be updated with the Update order item API.", + "operationId": "CreateOrderItem", "consumes": [ "application/json" ], @@ -1094,7 +922,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1106,24 +934,24 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "name": "orderResource", + "name": "orderItemResource", "in": "body", - "description": "Order details from request body.", + "description": "Order item details from request body.", "required": true, "schema": { - "$ref": "#/definitions/OrderResource" + "$ref": "#/definitions/OrderItemResource" } } ], "responses": { "200": { - "description": "Returns order object", + "description": "Returns order item object", "schema": { - "$ref": "#/definitions/OrderResource" + "$ref": "#/definitions/OrderItemResource" } }, "202": { - "description": "Accepted request to create order." + "description": "Accepted request to create order item." }, "default": { "description": "Error response describing reason for operation failure.", @@ -1134,17 +962,17 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "CreateOrder": { - "$ref": "./examples/OrderCreate.json" + "CreateOrderItem": { + "$ref": "./examples/OrderItemCreate.json" } } }, "delete": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Deletes an order.", - "operationId": "DeleteOrderByName", + "description": "Deletes an order item.", + "operationId": "DeleteOrderItemByName", "consumes": [ "application/json" ], @@ -1153,7 +981,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1167,13 +995,13 @@ ], "responses": { "200": { - "description": "Order Deleted" + "description": "Order Item Deleted" }, "202": { - "description": "Accepted delete request for an order" + "description": "Accepted delete request for an order item" }, "204": { - "description": "No content. Order deleted" + "description": "No content. Order item deleted" }, "default": { "description": "Error response describing reason for operation failure.", @@ -1184,17 +1012,17 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "DeleteOrderByName": { - "$ref": "./examples/OrderDelete.json" + "DeleteOrderItemByName": { + "$ref": "./examples/OrderItemDelete.json" } } }, "patch": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Updates the properties of an existing order.", - "operationId": "UpdateOrder", + "description": "Updates the properties of an existing order item.", + "operationId": "UpdateOrderItem", "consumes": [ "application/json" ], @@ -1203,7 +1031,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1222,23 +1050,23 @@ "type": "string" }, { - "name": "orderUpdateParameter", + "name": "orderItemUpdateParameter", "in": "body", - "description": "order update parameters from request body.", + "description": "order item update parameters from request body.", "required": true, "schema": { - "$ref": "#/definitions/OrderUpdateParameter" + "$ref": "#/definitions/OrderItemUpdateParameter" } } ], "responses": { "202": { - "description": "Accepted request for order update." + "description": "Accepted request for order item update." }, "200": { - "description": "Order resource object", + "description": "Order item resource object", "schema": { - "$ref": "#/definitions/OrderResource" + "$ref": "#/definitions/OrderItemResource" } }, "default": { @@ -1250,19 +1078,19 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "UpdateOrder": { - "$ref": "./examples/OrderUpdate.json" + "UpdateOrderItem": { + "$ref": "./examples/OrderItemUpdate.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orders/{orderName}/cancel": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderItems/{orderItemName}/cancel": { "post": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Cancel order.", - "operationId": "CancelOrder", + "description": "Cancel order item.", + "operationId": "CancelOrderItem", "consumes": [ "application/json" ], @@ -1271,7 +1099,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1307,19 +1135,19 @@ } }, "x-ms-examples": { - "CancelOrder": { - "$ref": "./examples/OrderCancel.json" + "CancelOrderItem": { + "$ref": "./examples/OrderItemCancel.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orders/{orderName}/return": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EdgeOrder/orderItems/{orderItemName}/return": { "post": { "tags": [ - "Orders" + "OrderItems" ], - "description": "Return order.", - "operationId": "ReturnOrder", + "description": "Return order item.", + "operationId": "ReturnOrderItem", "consumes": [ "application/json" ], @@ -1328,7 +1156,7 @@ ], "parameters": [ { - "$ref": "#/parameters/orderNameParameter" + "$ref": "#/parameters/orderItemNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" @@ -1340,12 +1168,12 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "name": "returnOrderDetails", + "name": "returnOrderItemDetails", "in": "body", - "description": "Return order CurrentStatus.", + "description": "Return order item CurrentStatus.", "required": true, "schema": { - "$ref": "#/definitions/ReturnOrderDetails" + "$ref": "#/definitions/ReturnOrderItemDetails" } } ], @@ -1354,7 +1182,7 @@ "description": "Success" }, "202": { - "description": "\"Return order request accepted.\"" + "description": "\"Return order item request accepted.\"" }, "default": { "description": "Error response describing reason for operation failure.", @@ -1365,8 +1193,8 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "ReturnOrder": { - "$ref": "./examples/OrderReturn.json" + "ReturnOrderItem": { + "$ref": "./examples/OrderItemReturn.json" } } } @@ -1387,11 +1215,11 @@ "AddressDetails": { "description": "Address details for an order.", "required": [ - "shippingAddress" + "forwardAddress" ], "type": "object", "properties": { - "shippingAddress": { + "forwardAddress": { "$ref": "#/definitions/AddressProperties", "description": "Customer address and contact details. It should be address resource" }, @@ -1655,37 +1483,6 @@ } } }, - "CloudError": { - "type": "object", - "properties": { - "code": { - "type": "string" - }, - "message": { - "type": "string" - }, - "target": { - "type": "string" - }, - "details": { - "uniqueItems": false, - "type": "array", - "items": { - "$ref": "#/definitions/CloudError" - }, - "readOnly": true - }, - "additionalInfo": { - "uniqueItems": false, - "type": "array", - "items": { - "$ref": "#/definitions/AdditionalErrorInfo" - }, - "readOnly": true - } - }, - "x-ms-external": true - }, "CommonProperties": { "description": "Represents common properties across product hierarchy", "type": "object", @@ -1720,6 +1517,9 @@ }, "ConfigurationFilters": { "description": "Configuration filters", + "required": [ + "hierarchyInformation" + ], "type": "object", "properties": { "hierarchyInformation": { @@ -1727,8 +1527,12 @@ "description": "Product hierarchy information" }, "filterableProperty": { - "$ref": "#/definitions/FilterableProperty", - "description": "Filters specific to product" + "description": "Filters specific to product", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/FilterableProperty" + } } } }, @@ -1796,7 +1600,8 @@ "description": "Contact Details.", "required": [ "contactName", - "phone" + "phone", + "emailList" ], "type": "object", "properties": { @@ -1815,6 +1620,13 @@ "mobile": { "description": "Mobile number of the contact person.", "type": "string" + }, + "emailList": { + "description": "List of Email-ids to be notified about job progress.", + "type": "array", + "items": { + "type": "string" + } } } }, @@ -1822,46 +1634,62 @@ "description": "Cost information for the product system", "type": "object", "properties": { - "primaryMeterType": { - "description": "Primary meter i.e. basic billing type for the product system.", + "billingMeterDetails": { + "description": "Details on the various billing aspects for the product system.", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/BillingMeterDetails" + }, + "readOnly": true + }, + "billingInfoUrl": { + "description": "Default url to display billing information", + "type": "string", + "readOnly": true + } + } + }, + "BillingMeterDetails": { + "description": "Holds billing meter details for each type of billing", + "type": "object", + "properties": { + "name": { + "description": "Represents Billing type name", + "type": "string", + "readOnly": true + }, + "meterDetails": { + "$ref": "#/definitions/MeterDetails", + "description": "Represents MeterDetails", + "readOnly": true + }, + "meteringType": { + "description": "Represents Metering type (eg one-time or recurrent)", "enum": [ - "ServiceFee", - "ShippingFee", - "LostOrDamagedFee", - "LateDayFee" + "OneTime", + "Recurring" ], "type": "string", "readOnly": true, "x-ms-enum": { - "name": "MeterType", + "name": "MeteringType", "modelAsExtensible": true, "values": [ { - "value": "ServiceFee", - "description": "Service usage fee." - }, - { - "value": "ShippingFee", - "description": "Shipping fee." + "value": "OneTime", + "description": "One time billing." }, { - "value": "LostOrDamagedFee", - "description": "Fee charged if the device is lost or damaged." - }, - { - "value": "LateDayFee", - "description": "Fee charged if the device is kept longer that the allotted days." + "value": "Recurring", + "description": "Recurring billing." } ] } }, - "meterDetails": { - "description": "Details on the various billing aspects for the product system.", - "uniqueItems": false, - "type": "array", - "items": { - "$ref": "#/definitions/MeterDetails" - }, + "frequency": { + "description": "Frequency of recurrence", + "type": "string", "readOnly": true } } @@ -1937,7 +1765,7 @@ "readOnly": true }, "deviceHistory": { - "description": "Package Shipping details", + "description": "Device history", "uniqueItems": false, "type": "array", "items": { @@ -1947,17 +1775,47 @@ } } }, + "EncryptionPreferences": { + "description": "Preferences related to the double encryption", + "type": "object", + "properties": { + "doubleEncryptionStatus": { + "description": "Defines secondary layer of software-based encryption enablement.", + "enum": [ + "Disabled", + "Enabled" + ], + "type": "string", + "x-ms-enum": { + "name": "DoubleEncryptionStatus", + "modelAsExtensible": true, + "values": [ + { + "value": "Disabled", + "description": "Double encryption is disabled" + }, + { + "value": "Enabled", + "description": "Double encryption is enabled" + } + ] + } + } + } + }, "FilterableProperty": { "description": "Class defining the list of filter values on a filter type as part of configuration request.", "required": [ - "type" + "type", + "supportedValues" ], "type": "object", "properties": { "type": { "description": "Type of product filter.", "enum": [ - "ShipToCountries" + "ShipToCountries", + "DoubleEncryptionStatus" ], "type": "string", "x-ms-enum": { @@ -1967,6 +1825,10 @@ { "value": "ShipToCountries", "description": "Ship to country" + }, + { + "value": "DoubleEncryptionStatus", + "description": "Double encryption status" } ] } @@ -2096,54 +1958,77 @@ } } }, + "ManagementResourceDetails": { + "description": "Management resource details to link device", + "type": "object", + "required": [ + "managementResourceArmId" + ], + "properties": { + "managementResourceArmId": { + "description": "Management resource ARM ID", + "type": "string" + } + } + }, "MeterDetails": { - "description": "Billing details for each meter.", + "description": "Holds details about billing type and its meter guids", "type": "object", "properties": { - "meterId": { - "description": "MeterId/ Billing Guid against which the product system will be charged", - "type": "string", - "readOnly": true - }, - "meterType": { - "description": "Category of the billing meter.", + "billingType": { + "description": "Represents billing type.", "enum": [ - "ServiceFee", - "ShippingFee", - "LostOrDamagedFee", - "LateDayFee" + "Pav2", + "Purchase" ], "type": "string", "readOnly": true, "x-ms-enum": { - "name": "MeterType", + "name": "BillingType", "modelAsExtensible": true, "values": [ { - "value": "ServiceFee", - "description": "Service usage fee." + "value": "Pav2", + "description": "Pav2 billing type." }, { - "value": "ShippingFee", - "description": "Shipping fee." - }, + "value": "Purchase", + "description": "Purchase billing type." + } + ] + } + }, + "multiplier": { + "format": "double", + "description": "Billing unit applicable for Pav2 billing", + "type": "number", + "readOnly": true + }, + "chargingType": { + "description": "Charging type.", + "enum": [ + "PerOrder", + "PerDevice" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "ChargingType", + "modelAsExtensible": true, + "values": [ { - "value": "LostOrDamagedFee", - "description": "Fee charged if the device is lost or damaged." + "value": "PerOrder", + "description": "Per order charging type." }, { - "value": "LateDayFee", - "description": "Fee charged if the device is kept longer that the allotted days." + "value": "PerDevice", + "description": "Per device charging type." } ] } - }, - "billingModel": { - "$ref": "#/definitions/BillingModel", - "description": "Billing model to represent billing cycle, i.e. Monthly, biweekly, daily, hourly etc.", - "readOnly": true } - } + }, + "x-ms-discriminator-value": "billingType" }, "NotificationPreference": { "description": "Notification preference for a job stage.", @@ -2157,7 +2042,7 @@ "description": "Name of the stage.", "enum": [ "DevicePrepared", - "Dispatched", + "Shipped", "Delivered", "PickedUp", "AtAzureDC", @@ -2173,7 +2058,7 @@ "description": "Notification at device prepared stage." }, { - "value": "Dispatched", + "value": "Shipped", "description": "Notification at device dispatched stage." }, { @@ -2201,38 +2086,50 @@ } } }, - "OrderCollectionProperties": { - "description": "Represents order collection details.", - "required": [ - "orderIds" - ], + "OrderProperties": { + "description": "Represents order details.", "type": "object", "properties": { - "orderIds": { - "description": "List of order ARM Ids which are part of an order collection.", + "orderItemIds": { + "description": "List of order item ARM Ids which are part of an order.", "uniqueItems": false, "type": "array", "items": { "type": "string" - } + }, + "readOnly": true + }, + "currentStage": { + "$ref": "#/definitions/StageDetails", + "description": "Order current status.", + "readOnly": true + }, + "orderStageHistory": { + "description": "Order status history.", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/StageDetails" + }, + "readOnly": true } } }, - "OrderCollectionResource": { - "description": "Specifies the properties or parameters for an order collection. Order collection is a grouping of one or more orders.", + "OrderResource": { + "description": "Specifies the properties or parameters for an order. Order is a grouping of one or more order items.", "required": [ "properties" ], "type": "object", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ], "properties": { "properties": { - "$ref": "#/definitions/OrderCollectionProperties", - "description": "Order collection properties", + "$ref": "#/definitions/OrderProperties", + "description": "Order properties", "x-ms-client-flatten": true }, "systemData": { @@ -2242,43 +2139,30 @@ } } }, - "OrderCollectionResourceList": { - "description": "Specifies the list of order collections.", + "OrderItemResourceList": { + "description": "List of orderItems.", "type": "object", "properties": { "value": { - "description": "List of order collection resources.", + "description": "List of order item resources.", "uniqueItems": false, "type": "array", "items": { - "$ref": "#/definitions/OrderCollectionResource" + "$ref": "#/definitions/OrderItemResource" }, "readOnly": true }, "nextLink": { - "description": "Link for the next set of order collection resources.", + "description": "Link for the next set of order item resources.", "type": "string" } } }, - "OrderCollectionUpdateParameter": { - "description": "Specifies the parameters which can be updated for an order collection.", - "type": "object", - "properties": { - "tags": { - "description": "The list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups).", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "OrderDetails": { - "description": "Order details", + "OrderItemDetails": { + "description": "Order item details", "required": [ "productDetails", - "orderType" + "orderItemType" ], "type": "object", "properties": { @@ -2286,39 +2170,39 @@ "$ref": "#/definitions/ProductDetails", "description": "Unique identifier for configuration." }, - "orderType": { - "description": "Order type.", + "orderItemType": { + "description": "Order item type.", "enum": [ "Purchase", "Rental" ], "type": "string", "x-ms-enum": { - "name": "OrderType", + "name": "OrderItemType", "modelAsExtensible": true, "values": [ { "value": "Purchase", - "description": "Purchase Order." + "description": "Purchase OrderItem." }, { "value": "Rental", - "description": "Rental Order." + "description": "Rental OrderItem." } ] } }, - "currentStatus": { - "$ref": "#/definitions/OrderStatusDetails", - "description": "Current Order Status", + "currentStage": { + "$ref": "#/definitions/StageDetails", + "description": "Current Order item Status", "readOnly": true }, - "orderStatusHistory": { - "description": "Order history", + "orderItemStageHistory": { + "description": "Order item status history", "uniqueItems": false, "type": "array", "items": { - "$ref": "#/definitions/OrderStatusDetails" + "$ref": "#/definitions/StageDetails" }, "readOnly": true }, @@ -2337,7 +2221,7 @@ "readOnly": true }, "notificationEmailList": { - "description": "Package Shipping details", + "description": "Additional notification email list", "uniqueItems": false, "type": "array", "items": { @@ -2359,26 +2243,26 @@ "type": "string", "readOnly": true, "x-ms-enum": { - "name": "OrderCancellationEnum", + "name": "OrderItemCancellationEnum", "modelAsExtensible": true, "values": [ { "value": "Cancellable", - "description": "Order can be cancelled without fee." + "description": "Order item can be cancelled without fee." }, { "value": "CancellableWithFee", - "description": "Order can be cancelled with fee." + "description": "Order item can be cancelled with fee." }, { "value": "NotCancellable", - "description": "Order not cancellable." + "description": "Order item not cancellable." } ] } }, "deletionStatus": { - "description": "Describes whether the order is deletable or not.", + "description": "Describes whether the order item is deletable or not.", "enum": [ "Allowed", "NotAllowed" @@ -2406,7 +2290,7 @@ "readOnly": true }, "returnStatus": { - "description": "Describes whether the order is returnable or not.", + "description": "Describes whether the order item is returnable or not.", "enum": [ "Returnable", "ReturnableWithFee", @@ -2415,20 +2299,20 @@ "type": "string", "readOnly": true, "x-ms-enum": { - "name": "OrderReturnEnum", + "name": "OrderItemReturnEnum", "modelAsExtensible": true, "values": [ { "value": "Returnable", - "description": "Order can be returned without fee." + "description": "Order item can be returned without fee." }, { "value": "ReturnableWithFee", - "description": "Order can be returned with fee." + "description": "Order item can be returned with fee." }, { "value": "NotReturnable", - "description": "Order not returnable." + "description": "Order item not returnable." } ] } @@ -2438,24 +2322,29 @@ "description": "parent RP details", "readOnly": true }, + "managementResourceDetails": { + "$ref": "#/definitions/ManagementResourceDetails", + "description": "Management resource details" + }, "error": { - "$ref": "#/definitions/CloudError", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail", "description": "Top level error for the job.", "readOnly": true } } }, - "OrderProperties": { - "description": "Represents order details.", + "OrderItemProperties": { + "description": "Represents order item details.", "required": [ - "orderDetails", - "addressDetails" + "orderItemDetails", + "addressDetails", + "orderId" ], "type": "object", "properties": { - "orderDetails": { - "$ref": "#/definitions/OrderDetails", - "description": "Represents order details." + "orderItemDetails": { + "$ref": "#/definitions/OrderItemDetails", + "description": "Represents order item details." }, "addressDetails": { "$ref": "#/definitions/AddressDetails", @@ -2463,19 +2352,18 @@ }, "startTime": { "format": "date-time", - "description": "Start time of order", + "description": "Start time of order item", "type": "string", "readOnly": true }, - "orderCollectionId": { - "description": "Id of the order collection to which order belongs to", - "type": "string", - "readOnly": true + "orderId": { + "description": "Id of the order to which order items belongs to", + "type": "string" } } }, - "OrderResource": { - "description": "Represents order contract", + "OrderItemResource": { + "description": "Represents order item contract", "required": [ "properties" ], @@ -2487,8 +2375,8 @@ ], "properties": { "properties": { - "$ref": "#/definitions/OrderProperties", - "description": "Order properties", + "$ref": "#/definitions/OrderItemProperties", + "description": "Order item properties", "x-ms-client-flatten": true }, "systemData": { @@ -2517,29 +2405,181 @@ } } }, - "OrderStatusDetails": { - "description": "Order status CurrentStatus", + "StageDetails": { + "description": "Resource stage details", "type": "object", "properties": { - "orderStatus": { - "description": "Order status", + "stageStatus": { + "description": "Stage status", + "enum": [ + "None", + "InProgress", + "Succeeded", + "Failed", + "Cancelled", + "Cancelling" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "StageStatus", + "modelAsExtensible": true, + "values": [ + { + "value": "None", + "description": "No status available yet." + }, + { + "value": "InProgress", + "description": "Stage is in progress." + }, + { + "value": "Succeeded", + "description": "Stage has succeeded." + }, + { + "value": "Failed", + "description": "Stage has failed." + }, + { + "value": "Cancelled", + "description": "Stage has been cancelled." + }, + { + "value": "Cancelling", + "description": "Stage is cancelling." + } + ] + } + }, + "stageName": { + "description": "Stage name", + "enum": [ + "DeviceOrdered", + "DevicePrepared", + "PickedUp", + "AtAzureDC", + "DataCopy", + "Completed", + "CompletedWithErrors", + "Cancelled", + "Aborted", + "CompletedWithWarnings", + "ReadyToDispatchFromAzureDC", + "ReadyToReceiveAtAzureDC", + "Placed", + "InReview", + "Confirmed", + "ReadyForDispatch", + "Shipped", + "Delivered", + "InUse" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "StageName", + "modelAsExtensible": 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" + }, + { + "value": "InReview", + "description": "Order is currently in draft mode and can still be cancelled" + }, + { + "value": "Confirmed", + "description": "Order is confirmed" + }, + { + "value": "ReadyForDispatch", + "description": "Order is ready for dispatch" + }, + { + "value": "Shipped", + "description": "Order is in transit to customer" + }, + { + "value": "Delivered", + "description": "Order is delivered to customer" + }, + { + "value": "InUse", + "description": "Order is in use at customer site" + } + ] + } + }, + "displayName": { + "description": "Display name of the resource stage.", "type": "string", "readOnly": true }, - "lastUpdatedTime": { - "description": "last time order was updated", + "startTime": { "format": "date-time", - "type": "string" + "description": "Stage start time", + "type": "string", + "readOnly": true } } }, - "OrderUpdateParameter": { - "description": "Updates order parameters.", + "OrderItemUpdateParameter": { + "description": "Updates order item parameters.", "type": "object", "properties": { "properties": { - "$ref": "#/definitions/OrderUpdateProperties", - "description": "Order update properties", + "$ref": "#/definitions/OrderItemUpdateProperties", + "description": "Order item update properties", "x-ms-client-flatten": true }, "tags": { @@ -2551,11 +2591,11 @@ } } }, - "OrderUpdateProperties": { - "description": "Order update properties.", + "OrderItemUpdateProperties": { + "description": "Order item update properties.", "type": "object", "properties": { - "shippingAddress": { + "forwardAddress": { "$ref": "#/definitions/AddressProperties", "description": "Updates forward shipping address and contact details." }, @@ -2573,6 +2613,23 @@ } } }, + "Pav2MeterDetails": { + "description": "Billing type PAV2 meter details", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MeterDetails" + } + ], + "properties": { + "meterGuid": { + "description": "Validation status of requested data center and transport.", + "type": "string", + "readOnly": true + } + }, + "x-ms-discriminator-value": "Pav2" + }, "Preferences": { "description": "Preferences related to the order", "type": "object", @@ -2588,6 +2645,10 @@ "transportPreferences": { "$ref": "#/definitions/TransportPreferences", "description": "Preferences related to the shipment logistics of the order." + }, + "encryptionPreferences": { + "$ref": "#/definitions/EncryptionPreferences", + "description": "Preferences related to the Encryption." } } }, @@ -2692,7 +2753,11 @@ "description": "Dictionary of filterable properties on product family.", "type": "object", "additionalProperties": { - "$ref": "#/definitions/FilterableProperty" + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/FilterableProperty" + } } }, "customerSubscriptionDetails": { @@ -2785,6 +2850,33 @@ } } }, + "PurchaseMeterDetails": { + "description": "Billing type Purchase meter details", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/MeterDetails" + } + ], + "properties": { + "productId": { + "description": "Product Id", + "type": "string", + "readOnly": true + }, + "skuId": { + "description": "Sku Id", + "type": "string", + "readOnly": true + }, + "termId": { + "description": "Term Id", + "type": "string", + "readOnly": true + } + }, + "x-ms-discriminator-value": "Purchase" + }, "ResourceIdentity": { "description": "Msi identity details of the resource", "type": "object", @@ -2810,8 +2902,8 @@ "type": "object", "properties": {} }, - "ReturnOrderDetails": { - "description": "Return order request body", + "ReturnOrderItemDetails": { + "description": "Return order item request body", "required": [ "returnReason" ], @@ -2943,6 +3035,7 @@ } }, "CustomerSubscriptionDetails": { + "description": "Holds Customer subscription details. Clients can display available products to unregistered customers by explicitly passing subscription details", "required": [ "quotaId" ], @@ -2967,6 +3060,7 @@ } }, "CustomerSubscriptionRegisteredFeatures": { + "description": "Represents subscription registered features", "type": "object", "properties": { "name": { @@ -3031,18 +3125,18 @@ "type": "string", "x-ms-parameter-location": "method" }, - "orderCollectionNameParameter": { - "name": "orderCollectionName", + "orderNameParameter": { + "name": "orderName", "in": "path", - "description": "The name of the order collection", + "description": "The name of the order", "required": true, "type": "string", "x-ms-parameter-location": "method" }, - "orderNameParameter": { - "name": "orderName", + "orderItemNameParameter": { + "name": "orderItemName", "in": "path", - "description": "The name of the order", + "description": "The name of the order item", "required": true, "type": "string", "x-ms-parameter-location": "method" 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/AddressCreate.json index 3bdba115fc42..65d2dc2eb577 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/AddressCreate.json @@ -34,7 +34,10 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemcr@microsoft.com" + ] } }, "location": "westus" @@ -59,7 +62,10 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemcr@microsoft.com" + ] } }, "location": "westus", 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/AddressGetByName.json index ff00c19effa5..08cd6cc1d054 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/AddressGetByName.json @@ -30,7 +30,10 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemcr@microsoft.com" + ] } }, "location": "westus", 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/AddressPatch.json index 934e2e9e4f9a..1a80d21622ca 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/AddressPatch.json @@ -31,7 +31,10 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344335", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemcr@microsoft.com" + ] } }, "tags": { @@ -61,7 +64,10 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344335", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemcr@microsoft.com" + ] } }, "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/AddressesGetAtResourceGrouplevel.json index 7f9e5a70f87b..fd6f2625938d 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/AddressesGetAtResourceGrouplevel.json @@ -31,7 +31,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", @@ -57,7 +61,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", @@ -83,7 +91,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", 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/AddressesGetAtSubscriptionLevel.json index b8dfbef9174d..906cd01988d1 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/AddressesGetAtSubscriptionLevel.json @@ -30,7 +30,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", @@ -56,7 +60,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", @@ -82,7 +90,11 @@ "contactDetails": { "contactName": "Petr Cech", "phone": "123344334", - "phoneExtension": "" + "phoneExtension": "", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] } }, "location": "westus", 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 new file mode 100644 index 000000000000..738be350815f --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "location": "%7B%7B%7Blocation%7D%7D", + "orderName": "TestOrderItemName901", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "properties": { + "orderItemIds": [ + "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901" + ], + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "0001-01-01T05:30:00+05:30" + }, + "orderStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + } + ] + }, + "name": "TestOrderItemName901", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901", + "type": "Microsoft.EdgeOrder/orders" + } + } + } +} 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 73f7a72c132e..c5a992c23441 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 @@ -6,28 +6,36 @@ "vscode-restclient" ], "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/providers/Microsoft.EdgeOrder/listConfigurations?api-version=2020-12-01-preview" + "https://localhost/subscriptions/{{subscriptionId}}/providers/Microsoft.EdgeOrder/listConfigurations?api-version=2020-12-01-preview" ], "Content-Type": [ "application/json; charset=utf-8" ], "Content-Length": [ - "323" + "498" ], "configurationsRequest": { "configurationFilters": [ { "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA" + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - gpu" }, - "filterableProperty": { - "type": "ShipToCountries", - "supportedValues": [ - "US" - ] - } + "filterableProperty": [ + { + "type": "ShipToCountries", + "supportedValues": [ + "US" + ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Enabled" + ] + } + ] } ] } @@ -59,9 +67,15 @@ "US", "UK" ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Enabled" + ] } ], - "displayName": "1 GPU", + "displayName": "azurestackedgepro-gpu 1 GPU", "description": { "descriptionType": "Base", "keywords": [], @@ -74,10 +88,10 @@ "disabledReason": "None" }, "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA", - "configurationName": "1GPU" + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - gpu", + "configurationName": "azurestackedgepro-gpu1 gpu" } } } 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 ccacae54d1df..8cde9566cb92 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 @@ -68,122 +68,101 @@ "isDataAction": false }, { - "name": "Microsoft.EdgeOrder/orders/cancel/action", + "name": "Microsoft.EdgeOrder/locations/orders/read", "display": { "provider": "Edge Ordering", - "resource": "Orders", - "operation": "Cancel Order", - "description": "Cancels an order in progress." + "resource": "ArmApiRes_orders", + "operation": "List or Get ArmApiRes_orders", + "description": "List or get the ArmApiRes_orders" }, "origin": "user", - "isDataAction": true - }, - { - "name": "Microsoft.EdgeOrder/orders/return/action", - "display": { - "provider": "Edge Ordering", - "resource": "Orders", - "operation": "Return Order", - "description": "Return an order." - }, - "origin": "user", - "isDataAction": true + "isDataAction": false }, { "name": "Microsoft.EdgeOrder/orders/read", "display": { "provider": "Edge Ordering", - "resource": "Orders", - "operation": "List or Get Orders", - "description": "List or get the Orders" + "resource": "ArmApiRes_orders", + "operation": "List or Get ArmApiRes_orders", + "description": "List or get the ArmApiRes_orders" }, "origin": "user", "isDataAction": false }, { - "name": "Microsoft.EdgeOrder/orders/delete", + "name": "Microsoft.EdgeOrder/orderItems/cancel/action", "display": { "provider": "Edge Ordering", - "resource": "Orders", - "operation": "Delete Orders", - "description": "Delete the Orders" + "resource": "ArmApiRes_orderItems" }, "origin": "user", - "isDataAction": false + "isDataAction": true }, { - "name": "Microsoft.EdgeOrder/orders/write", + "name": "Microsoft.EdgeOrder/orderItems/return/action", "display": { "provider": "Edge Ordering", - "resource": "Orders", - "operation": "Create or Update Orders", - "description": "Create or update the Orders" + "resource": "ArmApiRes_orderItems" }, "origin": "user", - "isDataAction": false + "isDataAction": true }, { - "name": "Microsoft.EdgeOrder/orderCollections/write", + "name": "Microsoft.EdgeOrder/orderItems/read", "display": { "provider": "Edge Ordering", - "resource": "Order Collections", - "operation": "Create or Update Order Collections", - "description": "Create or update the Order Collections" + "resource": "ArmApiRes_orderItems", + "operation": "List or Get ArmApiRes_orderItems", + "description": "List or get the ArmApiRes_orderItems" }, "origin": "user", "isDataAction": false }, { - "name": "Microsoft.EdgeOrder/orderCollections/read", + "name": "Microsoft.EdgeOrder/orderItems/delete", "display": { "provider": "Edge Ordering", - "resource": "Order Collections", - "operation": "List or Get Order Collections", - "description": "List or get the Order Collections" + "resource": "ArmApiRes_orderItems", + "operation": "Delete ArmApiRes_orderItems", + "description": "Delete the ArmApiRes_orderItems" }, "origin": "user", "isDataAction": false }, { - "name": "Microsoft.EdgeOrder/orderCollections/delete", + "name": "Microsoft.EdgeOrder/orderItems/write", "display": { "provider": "Edge Ordering", - "resource": "Order Collections", - "operation": "Delete Order Collections", - "description": "Delete the Order Collections" + "resource": "ArmApiRes_orderItems", + "operation": "Create or Update ArmApiRes_orderItems", + "description": "Create or update the ArmApiRes_orderItems" }, "origin": "user", "isDataAction": false }, { - "name": "Microsoft.EdgeOrder/locations/productFamiliesMetadata/read", + "name": "Microsoft.EdgeOrder/productFamiliesMetadata/action", "display": { "provider": "Edge Ordering", - "resource": "Product Families Metadata", - "operation": "List or Get Product Families Metadata", - "description": "List or get the Product Families Metadata" + "resource": "ArmApiRes_Microsoft.EdgeOrder" }, "origin": "user", - "isDataAction": false + "isDataAction": true }, { - "name": "Microsoft.EdgeOrder/locations/listProductFamilies/read", + "name": "Microsoft.EdgeOrder/listProductFamilies/read", "display": { "provider": "Edge Ordering", - "resource": "Product Families", - "operation": "List Product Families", - "description": "This method returns list of product families." + "resource": "ArmApiRes_Microsoft.EdgeOrder" }, "origin": "user", "isDataAction": true }, { - "name": "Microsoft.EdgeOrder/locations/productFamilies/productLines/products/configurations/read", + "name": "Microsoft.EdgeOrder/listConfigurations/action", "display": { "provider": "Edge Ordering", - "resource": "Product Configurations", - "operation": "List Product Configurations", - "description": "This method returns list of product configurations." + "resource": "ArmApiRes_Microsoft.EdgeOrder" }, "origin": "user", "isDataAction": true 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 new file mode 100644 index 000000000000..7654a1353a00 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json @@ -0,0 +1,79 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "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?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "orderItemIds": [ + "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901" + ], + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "0001-01-01T05:30:00+05:30" + }, + "orderStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + } + ] + }, + "name": "TestOrderItemName901", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901", + "type": "Microsoft.EdgeOrder/orders" + }, + { + "properties": { + "orderItemIds": [ + "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01" + ], + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "0001-01-01T05:30:00+05:30" + }, + "orderStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + } + ] + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orders" + } + ] + } + } + } +} 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 new file mode 100644 index 000000000000..e9088e13d141 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/providers/Microsoft.EdgeOrder/orders?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "orderItemIds": [ + "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901" + ], + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "0001-01-01T05:30:00+05:30" + }, + "orderStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + } + ] + }, + "name": "TestOrderItemName901", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901", + "type": "Microsoft.EdgeOrder/orders" + }, + { + "properties": { + "orderItemIds": [ + "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01" + ], + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "0001-01-01T05:30:00+05:30" + }, + "orderStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + } + ] + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orders" + } + ] + } + } + } +} 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 6328fd6d24b4..38b2fd23a071 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,16 +12,19 @@ "application/json; charset=utf-8" ], "Content-Length": [ - "120" + "174" ], "productFamiliesRequest": { "filterableProperties": { - "azurestackedge": { - "type": "ShipToCountries", - "supportedValues": [ - "US" - ] - } + "azurestackedge": [ + { + "type": "ShipToCountries", + "supportedValues": [ + "US", + "UK" + ] + } + ] } } }, @@ -37,191 +40,71 @@ "products": [ { "properties": { - "filterableProperties": [ + "configurations": [ { - "type": "ShipToCountries", - "supportedValues": [ - "US" - ] - } - ], - "displayName": "Azure Stack Edge Pro - GPU", - "description": { - "descriptionType": "Base", - "shortDescription": "Azure managed physical edge compute device", - "longDescription": "Cancelled", - "keywords": [ - "AtAzureDC", - "GPU" - ], - "attributes": [ - "1U device shipped by Microsoft", - "Hardware accelerated ML using NVIDIA T4 FPGA", - "Azure Private Zone Enabled" - ], - "links": [ - { - "linkType": "TermsAndConditions", - "linkUrl": "https://aka.mx/tc" - }, - { - "linkType": "KnowMore", - "linkUrl": "https://aka.mx/knowmore" + "properties": { + "specifications": [ + { + "name": "Cores", + "value": "24" + }, + { + "name": "Memory", + "value": "128 GB" + }, + { + "name": "Storage", + "value": "~8 TB" + } + ], + "filterableProperties": [ + { + "type": "ShipToCountries", + "supportedValues": [ + "US", + "UK" + ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Disabled" + ] + } + ], + "displayName": "Azure Stack Edge Pro - R 3 GPU", + "description": { + "descriptionType": "Base", + "keywords": [], + "attributes": [], + "links": [] + }, + "imageInformation": [], + "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" + } } - ] - }, - "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": { - "primaryMeterType": "ServiceFee", - "meterDetails": [ - { - "meterId": "2e0bf1cf-eaeb-4dce-8b37-03e60472bf66", - "meterType": "ServiceFee", - "billingModel": { - "model": "PT1M" - } - }, - { - "meterId": "24beef08-5f0a-4a1f-95fc-82d21a85a589", - "meterType": "ShippingFee", - "billingModel": { - "model": "PT0H" - } - }, - { - "meterId": "aa9e6a15-419f-482b-a890-fd60d4727955", - "meterType": "LostOrDamagedFee", - "billingModel": { - "model": "PT0H" - } - } - ] - }, - "availabilityInformation": { - "availabilityStage": "Available", - "disabledReason": "None" - }, - "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProGPU" - } - } - }, - { - "properties": { "filterableProperties": [ { "type": "ShipToCountries", "supportedValues": [ + "US", "UK" ] - } - ], - "displayName": "Azure Stack Edge Pro - FPGA", - "description": { - "descriptionType": "Base", - "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 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", - "keywords": [ - "Edge", - "FPGA" - ], - "attributes": [ - "1U device shipped by Microsoft", - "Hardware accelerated ML using Intel ARIA FPGA" - ], - "links": [ - { - "linkType": "TermsAndConditions", - "linkUrl": "https://aka.mx/tc" - }, - { - "linkType": "KnowMore", - "linkUrl": "https://aka.mx/knowmore" - } - ] - }, - "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": { - "primaryMeterType": "ServiceFee", - "meterDetails": [ - { - "meterId": "2e0bf1cf-eaeb-4dce-8b37-03e60472bf66", - "meterType": "ServiceFee", - "billingModel": { - "model": "PT1M" - } - }, - { - "meterId": "24beef08-5f0a-4a1f-95fc-82d21a85a589", - "meterType": "ShippingFee", - "billingModel": { - "model": "PT0H" - } - }, - { - "meterId": "aa9e6a15-419f-482b-a890-fd60d4727955", - "meterType": "LostOrDamagedFee", - "billingModel": { - "model": "PT0H" - } - } - ] - }, - "availabilityInformation": { - "availabilityStage": "Available", - "disabledReason": "None" - }, - "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA" - } - } - }, - { - "properties": { - "filterableProperties": [ - { - "type": "ShipToCountries", + "type": "DoubleEncryptionStatus", "supportedValues": [ - "US", - "UK" + "Enabled" ] } ], @@ -267,41 +150,17 @@ "imageUrl": "https://abc.com/1" } ], - "costInformation": { - "primaryMeterType": "ServiceFee", - "meterDetails": [ - { - "meterId": "2e0bf1cf-eaeb-4dce-8b37-03e60472bf66", - "meterType": "ServiceFee", - "billingModel": { - "model": "PT1M" - } - }, - { - "meterId": "24beef08-5f0a-4a1f-95fc-82d21a85a589", - "meterType": "ShippingFee", - "billingModel": { - "model": "PT0H" - } - }, - { - "meterId": "aa9e6a15-419f-482b-a890-fd60d4727955", - "meterType": "LostOrDamagedFee", - "billingModel": { - "model": "PT0H" - } - } - ] - }, + "costInformation": {}, "availabilityInformation": { "availabilityStage": "ComingSoon", "disabledReason": "NotAvailable", "disabledReasonMessage": "Device is not available yet" }, "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA" + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - r", + "configurationName": "" } } } @@ -313,9 +172,15 @@ "US", "UK" ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Enabled" + ] } ], - "displayName": "Azure Stack Edge", + "displayName": "Azure Stack Edge_Pl", "description": { "descriptionType": "Base", "keywords": [], @@ -328,8 +193,10 @@ "disabledReason": "None" }, "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge" + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "", + "configurationName": "" } } } @@ -341,6 +208,12 @@ "US", "UK" ] + }, + { + "type": "DoubleEncryptionStatus", + "supportedValues": [ + "Enabled" + ] } ], "displayName": "Azure Stack Edge", @@ -356,7 +229,10 @@ "disabledReason": "None" }, "hierarchyInformation": { - "productFamilyName": "AzureStackEdge" + "productFamilyName": "azurestackedge", + "productLineName": "", + "productName": "", + "configurationName": "" } } } 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 378eb86bc97d..67240b8f6d75 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 @@ -23,32 +23,7 @@ "links": [] }, "imageInformation": [], - "costInformation": { - "primaryMeterType": "ServiceFee", - "meterDetails": [ - { - "meterId": "2e0bf1cf-eaeb-4dce-8b37-03e60472bf66", - "meterType": "ServiceFee", - "billingModel": { - "model": "PT1M" - } - }, - { - "meterId": "24beef08-5f0a-4a1f-95fc-82d21a85a589", - "meterType": "ShippingFee", - "billingModel": { - "model": "PT0H" - } - }, - { - "meterId": "aa9e6a15-419f-482b-a890-fd60d4727955", - "meterType": "LostOrDamagedFee", - "billingModel": { - "model": "PT0H" - } - } - ] - }, + "costInformation": {}, "availabilityInformation": { "availabilityStage": "Available", "disabledReason": "None" diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionCreate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionCreate.json deleted file mode 100644 index 24620db5fce9..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionCreate.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderCollectionName": "TestOrderCollectionName1", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1?api-version=2020-12-01-preview" - ], - "Content-Type": [ - "application/json; charset=utf-8" - ], - "Content-Length": [ - "447" - ], - "orderCollectionResource": { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/TestRG/providers/Microsoft.EdgeOrder/Orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/TestRG1/providers/Microsoft.EdgeOrder/Orders/TestOrderName2" - ] - }, - "tags": { - "Name": "TestName", - "Work": "Engineering" - }, - "location": "westus" - } - }, - "responses": { - "202": {}, - "200": { - "body": { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG1/providers/Microsoft.EdgeOrder/orders/TestOrderName2" - ] - }, - "location": "westus", - "tags": { - "name": "TestName", - "work": "Engineering" - }, - "name": "TestOrderCollectionName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1", - "type": "Microsoft.EdgeOrder/orderCollections" - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionDelete.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionDelete.json deleted file mode 100644 index ac3d7874cc42..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionDelete.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderCollectionName": "TestOrderCollectionName1", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionGet.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionGet.json deleted file mode 100644 index aa2b11387bb1..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionGet.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderCollectionName": "TestOrderCollectionName1", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG1/providers/Microsoft.EdgeOrder/orders/TestOrderName2" - ] - }, - "location": "westus", - "tags": { - "name": "TestName", - "work": "Engineering" - }, - "name": "TestOrderCollectionName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1", - "type": "Microsoft.EdgeOrder/orderCollections" - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtRGLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtRGLevel.json deleted file mode 100644 index ee892f241887..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtRGLevel.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG1/providers/Microsoft.EdgeOrder/orders/TestOrderName2" - ] - }, - "location": "westus", - "tags": { - "name": "TestName", - "work": "Engineering" - }, - "name": "TestOrderCollectionName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1", - "type": "Microsoft.EdgeOrder/orderCollections" - } - ] - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtSubscriptionLevel.json deleted file mode 100644 index 51db77529b2c..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionListAtSubscriptionLevel.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/providers/Microsoft.EdgeOrder/orderCollections?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG1/providers/Microsoft.EdgeOrder/orders/TestOrderName2" - ] - }, - "location": "westus", - "tags": { - "name": "TestName", - "work": "Engineering" - }, - "name": "TestOrderCollectionName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1", - "type": "Microsoft.EdgeOrder/orderCollections" - } - ] - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionUpdate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionUpdate.json deleted file mode 100644 index 0102f806db29..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCollectionUpdate.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderCollectionName": "TestOrderCollectionName1", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1?api-version=2020-12-01-preview" - ], - "Content-Type": [ - "application/json; charset=utf-8" - ], - "Content-Length": [ - "193" - ], - "orderCollectionUpdateParameter": { - "tags": { - "Name": "TestName-Updated", - "Work": "Engineering", - "Hobby": "Coding-Added" - } - } - }, - "responses": { - "202": {}, - "200": { - "body": { - "properties": { - "orderIds": [ - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG1/providers/Microsoft.EdgeOrder/orders/TestOrderName2" - ] - }, - "location": "westus", - "tags": { - "name": "TestName-Updated", - "work": "Engineering", - "hobby": "Coding-Added" - }, - "name": "TestOrderCollectionName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderCollections/TestOrderCollectionName1", - "type": "Microsoft.EdgeOrder/orderCollections" - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCreate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCreate.json deleted file mode 100644 index 28184bb3f0e8..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCreate.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", - "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?api-version=2020-12-01-preview" - ], - "Content-Type": [ - "application/json; charset=utf-8" - ], - "Content-Length": [ - "829" - ], - "orderResource": { - "properties": { - "orderDetails": { - "orderType": "Purchase", - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "azurestackedge", - "productLineName": "azurestackedge", - "productName": "azurestackedgeprogpu", - "configurationName": "1gpu" - } - }, - "preferences": { - "transportPreferences": { - "preferredShipmentType": "MicrosoftManaged" - } - } - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - } - }, - "tags": { - "mango": "fruit", - "carrot": "vegetable" - }, - "location": "westus" - } - }, - "responses": { - "200": { - "body": { - "properties": { - "orderDetails": { - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA", - "configurationName": "1GPU" - }, - "count": 1, - "deviceDetails": [] - }, - "orderType": "Purchase", - "orderStatusHistory": [], - "preferences": { - "transportPreferences": { - "preferredShipmentType": "MicrosoftManaged" - } - }, - "notificationEmailList": [], - "cancellationReason": "", - "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnReason": "", - "returnStatus": "Returnable" - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - }, - "startTime": "0001-01-01T05:30:00+05:30", - "orderCollectionId": "" - }, - "location": "westus", - "tags": { - "mango": "fruit", - "carrot": "vegetable" - }, - "name": "TestOrderName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "type": "Microsoft.EdgeOrder/orders" - } - }, - "202": {} - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGet.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGet.json deleted file mode 100644 index 88664837bf73..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGet.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", - "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?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "properties": { - "orderDetails": { - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "azurestackedge", - "productLineName": "azurestackedge", - "productName": "azurestackedgeprogpu", - "configurationName": "1gpu" - }, - "count": 1, - "deviceDetails": [] - }, - "orderType": "Purchase", - "currentStatus": { - "orderStatus": "", - "lastUpdatedTime": "0001-01-01T05:30:00+05:30" - }, - "orderStatusHistory": [], - "preferences": { - "transportPreferences": { - "preferredShipmentType": "MicrosoftManaged" - } - }, - "notificationEmailList": [], - "cancellationReason": "", - "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnReason": "", - "returnStatus": "Returnable" - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - }, - "startTime": "0001-01-01T05:30:00+05:30", - "orderCollectionId": "" - }, - "location": "westus", - "tags": { - "mango": "fruit", - "carrot": "vegetable" - }, - "name": "TestOrderName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "type": "Microsoft.EdgeOrder/orders" - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetByRG.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetByRG.json deleted file mode 100644 index 5a6faa36c101..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetByRG.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "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?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "orderDetails": { - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "azurestackedge", - "productLineName": "azurestackedge", - "productName": "azurestackedgeprogpu", - "configurationName": "1gpu" - }, - "count": 1, - "deviceDetails": [] - }, - "orderType": "Purchase", - "currentStatus": { - "orderStatus": "", - "lastUpdatedTime": "0001-01-01T05:30:00+05:30" - }, - "orderStatusHistory": [], - "preferences": { - "transportPreferences": { - "preferredShipmentType": "MicrosoftManaged" - } - }, - "notificationEmailList": [], - "cancellationReason": "", - "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnReason": "", - "returnStatus": "Returnable" - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - }, - "startTime": "0001-01-01T05:30:00+05:30", - "orderCollectionId": "" - }, - "location": "westus", - "tags": { - "mango": "fruit", - "carrot": "vegetable" - }, - "name": "TestOrderName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "type": "Microsoft.EdgeOrder/orders" - } - ] - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetBySubscription.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetBySubscription.json deleted file mode 100644 index a45a5a8f56b5..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderGetBySubscription.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "api-version": "2020-12-01-preview", - "User-Agent": [ - "vscode-restclient" - ], - "Referer": [ - "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/providers/Microsoft.EdgeOrder/orders?api-version=2020-12-01-preview" - ] - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "orderDetails": { - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "azurestackedge", - "productLineName": "azurestackedge", - "productName": "azurestackedgeprogpu", - "configurationName": "1gpu" - }, - "count": 1, - "deviceDetails": [] - }, - "orderType": "Purchase", - "currentStatus": { - "orderStatus": "", - "lastUpdatedTime": "0001-01-01T05:30:00+05:30" - }, - "orderStatusHistory": [], - "preferences": { - "transportPreferences": { - "preferredShipmentType": "MicrosoftManaged" - } - }, - "notificationEmailList": [], - "cancellationReason": "", - "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnReason": "", - "returnStatus": "Returnable" - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - }, - "startTime": "0001-01-01T05:30:00+05:30", - "orderCollectionId": "" - }, - "location": "westus", - "tags": { - "mango": "fruit", - "carrot": "vegetable" - }, - "name": "TestOrderName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "type": "Microsoft.EdgeOrder/orders" - } - ] - } - } - } -} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCancel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json similarity index 94% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCancel.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json index c9c90e440a0f..4776fefb2196 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderCancel.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCancel.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", + "orderItemName": "TestOrderName1", "api-version": "2020-12-01-preview", "User-Agent": [ "vscode-restclient" 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/OrderItemCreate.json new file mode 100644 index 000000000000..745a4512e6de --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemCreate.json @@ -0,0 +1,156 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "orderItemName": "TestOrderItemName01", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01?api-version=2020-12-01-preview" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Content-Length": [ + "1388" + ], + "orderItemResource": { + "properties": { + "orderItemDetails": { + "orderItemType": "Purchase", + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "Azure Stack Edge_Pl", + "productName": "Azure Stack Edge Pro - FPGA", + "configurationName": "Azure Stack Edge Pro - FPGA 1 GPU" + } + }, + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + } + }, + "addressDetails": { + "forwardAddress": { + "shippingAddress": { + "streetAddress1": "16 townsend st", + "streetAddress2": "unit 1", + "city": "san francisco", + "stateOrProvince": "ca", + "country": "us", + "postalCode": "94107", + "companyName": "microsoft", + "zipExtendedCode": "1", + "addressType": "Residential" + }, + "contactDetails": { + "contactName": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "location": "westus" + } + }, + "responses": { + "200": { + "body": { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:17:13.1376775+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:17:13.1376775+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orderItems" + } + }, + "202": {} + } +} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderDelete.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json similarity index 80% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderDelete.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json index f93701d7d9c7..1d683f6a4527 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderDelete.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemDelete.json @@ -2,18 +2,18 @@ "parameters": { "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", + "orderItemName": "TestOrderItemName01", "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?api-version=2020-12-01-preview" + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01?api-version=2020-12-01-preview" ] }, "responses": { - "200": {}, "202": {}, + "200": {}, "204": {} } } 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/OrderItemGet.json new file mode 100644 index 000000000000..9257bae6e814 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGet.json @@ -0,0 +1,100 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "orderItemName": "TestOrderItemName01", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:17:13.1376775+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:17:13.1376775+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orderItems" + } + } + } +} 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/OrderItemGetByRG.json new file mode 100644 index 000000000000..58b12efd0a25 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetByRG.json @@ -0,0 +1,185 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:13:04.0758106+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:13:04.0758106+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName901", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901", + "type": "Microsoft.EdgeOrder/orderItems" + }, + { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:17:13.1376775+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:17:13.1376775+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orderItems" + } + ] + } + } + } +} 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/OrderItemGetBySubscription.json new file mode 100644 index 000000000000..672cd69fff94 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemGetBySubscription.json @@ -0,0 +1,184 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/providers/Microsoft.EdgeOrder/orderItems?api-version=2020-12-01-preview" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:13:04.0758106+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:13:04.0758106+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName901" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName901", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName901", + "type": "Microsoft.EdgeOrder/orderItems" + }, + { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:17:13.1376775+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "MicrosoftManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "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": "164 TOWNSEND ST", + "phone": "32131311", + "emailList": [ + "ssemmail@microsoft.com", + "vishwamdir@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:17:13.1376775+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "location": "westus", + "tags": { + "mango": "fruit", + "carrot": "vegetable" + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orderItems" + } + ] + } + } + } +} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderReturn.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemReturn.json similarity index 80% rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderReturn.json rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemReturn.json index caa050cf6d01..1da3c3459b8c 100644 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderReturn.json +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemReturn.json @@ -2,13 +2,13 @@ "parameters": { "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", + "orderItemName": "TestOrderName1", "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/return?api-version=2020-12-01-preview" + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01/return?api-version=2020-12-01-preview" ], "Content-Type": [ "application/json; charset=utf-8" @@ -16,7 +16,7 @@ "Content-Length": [ "39" ], - "returnOrderDetails": { + "returnOrderItemDetails": { "returnReason": "Order returned" } }, 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/OrderItemUpdate.json new file mode 100644 index 000000000000..7d6e178ba412 --- /dev/null +++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderItemUpdate.json @@ -0,0 +1,119 @@ +{ + "parameters": { + "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", + "resourceGroupName": "TestRG", + "orderItemName": "TestOrderItemName01", + "api-version": "2020-12-01-preview", + "User-Agent": [ + "vscode-restclient" + ], + "Referer": [ + "https://localhost/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01?api-version=2020-12-01-preview" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Content-Length": [ + "493" + ], + "orderItemUpdateParameter": { + "properties": { + "forwardAddress": { + "contactDetails": { + "contactName": "Updated contact name", + "phone": "22222", + "emailList": [ + "testemail@microsoft.com" + ] + } + }, + "preferences": { + "transportPreferences": { + "preferredShipmentType": "CustomerManaged" + } + } + }, + "tags": { + "pigeon": "bird", + "tiger": "animal", + "ant": "insect" + } + } + }, + "responses": { + "200": { + "body": { + "properties": { + "orderItemDetails": { + "productDetails": { + "hierarchyInformation": { + "productFamilyName": "azurestackedge", + "productLineName": "azure stack edge_pl", + "productName": "azure stack edge pro - fpga", + "configurationName": "azure stack edge pro - fpga 1 gpu" + }, + "count": 0, + "deviceDetails": [] + }, + "orderItemType": "Purchase", + "currentStage": { + "stageStatus": "InProgress", + "stageName": "InReview", + "startTime": "2021-03-24T15:17:13.1376775+05:30" + }, + "orderItemStageHistory": [ + { + "stageStatus": "None", + "stageName": "InReview" + }, + { + "stageStatus": "None", + "stageName": "Placed" + }, + { + "stageStatus": "None", + "stageName": "Confirmed" + }, + { + "stageStatus": "None", + "stageName": "ReadyForDispatch" + } + ], + "preferences": { + "transportPreferences": { + "preferredShipmentType": "CustomerManaged" + } + }, + "notificationEmailList": [], + "cancellationStatus": "Cancellable", + "deletionStatus": "Allowed", + "returnStatus": "Returnable" + }, + "addressDetails": { + "forwardAddress": { + "contactDetails": { + "contactName": "Updated contact name", + "phone": "22222", + "emailList": [ + "testemail@microsoft.com" + ] + } + } + }, + "startTime": "2021-03-24T15:17:13.1376775+05:30", + "orderId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/locations/westus/orders/TestOrderItemName01" + }, + "location": "westus", + "tags": { + "pigeon": "bird", + "tiger": "animal", + "ant": "insect" + }, + "name": "TestOrderItemName01", + "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orderItems/TestOrderItemName01", + "type": "Microsoft.EdgeOrder/orderItems" + } + }, + "202": {} + } +} diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderUpdate.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderUpdate.json deleted file mode 100644 index 6cc662736e46..000000000000 --- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/OrderUpdate.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "parameters": { - "subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f", - "resourceGroupName": "TestRG", - "orderName": "TestOrderName1", - "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?api-version=2020-12-01-preview" - ], - "Content-Type": [ - "application/json; charset=utf-8" - ], - "Content-Length": [ - "268" - ], - "orderUpdateParameter": { - "properties": { - "preferences": { - "transportPreferences": { - "preferredShipmentType": "CustomerManaged" - } - } - }, - "tags": { - "pigeon": "bird", - "tiger": "animal", - "ant": "insect" - } - } - }, - "responses": { - "200": { - "body": { - "properties": { - "orderDetails": { - "productDetails": { - "hierarchyInformation": { - "productFamilyName": "AzureStackEdge", - "productLineName": "AzureStackEdge", - "productName": "AzureStackEdgeProFPGA", - "configurationName": "1GPU" - }, - "count": 1, - "deviceDetails": [] - }, - "orderType": "Purchase", - "currentStatus": { - "orderStatus": "", - "lastUpdatedTime": "0001-01-01T05:30:00+05:30" - }, - "orderStatusHistory": [], - "preferences": { - "transportPreferences": { - "preferredShipmentType": "CustomerManaged" - } - }, - "notificationEmailList": [], - "cancellationReason": "", - "cancellationStatus": "Cancellable", - "deletionStatus": "Allowed", - "returnReason": "", - "returnStatus": "Returnable" - }, - "addressDetails": { - "shippingAddress": { - "contactDetails": { - "contactName": "first", - "phone": "11111" - } - } - }, - "startTime": "0001-01-01T05:30:00+05:30", - "orderCollectionId": "" - }, - "location": "westus", - "tags": { - "pigeon": "bird", - "tiger": "animal", - "ant": "insect" - }, - "name": "TestOrderName1", - "id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/TestRG/providers/Microsoft.EdgeOrder/orders/TestOrderName1", - "type": "Microsoft.EdgeOrder/orders" - } - }, - "202": {} - } -}