From 543282903a47ea57ce45b46f17c0964a9312bb5a Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 22 Oct 2021 06:49:15 +0000 Subject: [PATCH] CodeGen from PR 16509 in Azure/azure-rest-api-specs Merge 1416156c0ea3661be5c85a5243f050de0dddbf28 into 32652d34b63d39b2c9ca52cf97e2f805b881dd4a --- sdk/edgeorder/azure-mgmt-edgeorder/_meta.json | 8 +- .../azure/mgmt/edgeorder/_metadata.json | 18 +- ...edge_order_management_client_operations.py | 26 ++- .../azure/mgmt/edgeorder/models/__init__.py | 9 + .../_edge_order_management_client_enums.py | 7 +- .../azure/mgmt/edgeorder/models/_models.py | 186 +++++++++++++++-- .../mgmt/edgeorder/models/_models_py3.py | 195 ++++++++++++++++-- ...edge_order_management_client_operations.py | 26 ++- 8 files changed, 414 insertions(+), 61 deletions(-) diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/_meta.json b/sdk/edgeorder/azure-mgmt-edgeorder/_meta.json index d96537615fcd..408b8100d6aa 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/_meta.json +++ b/sdk/edgeorder/azure-mgmt-edgeorder/_meta.json @@ -1,11 +1,11 @@ { - "autorest": "3.4.2", + "autorest": "3.4.5", "use": [ - "@autorest/python@5.8.1", + "@autorest/python@5.8.4", "@autorest/modelerfour@4.19.2" ], - "commit": "f985f05e68b7720cd5cd4c55bd89ce8463f7e554", + "commit": "617a633f2762e180458275a583728186a097916a", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/edgeorder/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.1 --use=@autorest/modelerfour@4.19.2 --version=3.4.2", + "autorest_command": "autorest specification/edgeorder/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5", "readme": "specification/edgeorder/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/_metadata.json b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/_metadata.json index 5c00fb13ce9f..9a875506bbfd 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/_metadata.json +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/_metadata.json @@ -177,15 +177,15 @@ }, "list_order_items_at_subscription_level" : { "sync": { - "signature": "def list_order_items_at_subscription_level(\n self,\n filter=None, # type: Optional[str]\n skip_token=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", - "doc": "\"\"\"Lists order at subscription level.\n\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param skip_token: $skipToken is supported on Get list of orders, which provides the next page\n in the list of order.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "signature": "def list_order_items_at_subscription_level(\n self,\n filter=None, # type: Optional[str]\n expand=None, # type: Optional[str]\n skip_token=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"Lists order item at subscription level.\n\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def list_order_items_at_subscription_level(\n self,\n filter: Optional[str] = None,\n skip_token: Optional[str] = None,\n **kwargs: Any\n) -\u003e AsyncItemPaged[\"_models.OrderItemResourceList\"]:\n", - "doc": "\"\"\"Lists order at subscription level.\n\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param skip_token: $skipToken is supported on Get list of orders, which provides the next page\n in the list of order.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "signature": "def list_order_items_at_subscription_level(\n self,\n filter: Optional[str] = None,\n expand: Optional[str] = None,\n skip_token: Optional[str] = None,\n **kwargs: Any\n) -\u003e AsyncItemPaged[\"_models.OrderItemResourceList\"]:\n", + "doc": "\"\"\"Lists order item at subscription level.\n\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, - "call": "filter, skip_token" + "call": "filter, expand, skip_token" }, "list_addresses_at_resource_group_level" : { "sync": { @@ -310,24 +310,24 @@ "list_order_items_at_resource_group_level" : { "sync": { "signature": "def list_order_items_at_resource_group_level(\n self,\n resource_group_name, # type: str\n filter=None, # type: Optional[str]\n expand=None, # type: Optional[str]\n skip_token=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", - "doc": "\"\"\"Lists order item at resource group level.\n\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details parameter for order item, which provides\n details on the devices of the product.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "doc": "\"\"\"Lists order item at resource group level.\n\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, "signature": "def list_order_items_at_resource_group_level(\n self,\n resource_group_name: str,\n filter: Optional[str] = None,\n expand: Optional[str] = None,\n skip_token: Optional[str] = None,\n **kwargs: Any\n) -\u003e AsyncItemPaged[\"_models.OrderItemResourceList\"]:\n", - "doc": "\"\"\"Lists order item at resource group level.\n\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details parameter for order item, which provides\n details on the devices of the product.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "doc": "\"\"\"Lists order item at resource group level.\n\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param filter: $filter is supported to filter based on order id. Filter supports only equals\n operation.\n:type filter: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:param skip_token: $skipToken is supported on Get list of order items, which provides the next\n page in the list of order items.\n:type skip_token: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either OrderItemResourceList or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~edge_order_management_client.models.OrderItemResourceList]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "resource_group_name, filter, expand, skip_token" }, "get_order_item_by_name" : { "sync": { "signature": "def get_order_item_by_name(\n self,\n order_item_name, # type: str\n resource_group_name, # type: str\n expand=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", - "doc": "\"\"\"Gets an order item.\n\n:param order_item_name: The name of the order item.\n:type order_item_name: str\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param expand: $expand is supported on device details parameter for order item, which provides\n details on the devices of the product.\n:type expand: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: OrderItemResource, or the result of cls(response)\n:rtype: ~edge_order_management_client.models.OrderItemResource\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "doc": "\"\"\"Gets an order item.\n\n:param order_item_name: The name of the order item.\n:type order_item_name: str\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: OrderItemResource, or the result of cls(response)\n:rtype: ~edge_order_management_client.models.OrderItemResource\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, "signature": "async def get_order_item_by_name(\n self,\n order_item_name: str,\n resource_group_name: str,\n expand: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.OrderItemResource\":\n", - "doc": "\"\"\"Gets an order item.\n\n:param order_item_name: The name of the order item.\n:type order_item_name: str\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param expand: $expand is supported on device details parameter for order item, which provides\n details on the devices of the product.\n:type expand: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: OrderItemResource, or the result of cls(response)\n:rtype: ~edge_order_management_client.models.OrderItemResource\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + "doc": "\"\"\"Gets an order item.\n\n:param order_item_name: The name of the order item.\n:type order_item_name: str\n:param resource_group_name: The name of the resource group. The name is case insensitive.\n:type resource_group_name: str\n:param expand: $expand is supported on device details, forward shipping details and reverse\n shipping details parameters. Each of these can be provided as a comma separated list. Device\n Details for order item provides details on the devices of the product, Forward and Reverse\n Shipping details provide forward and reverse shipping details respectively.\n:type expand: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: OrderItemResource, or the result of cls(response)\n:rtype: ~edge_order_management_client.models.OrderItemResource\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "order_item_name, resource_group_name, expand" }, diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/aio/operations/_edge_order_management_client_operations.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/aio/operations/_edge_order_management_client_operations.py index 5e1473836e7d..49f07ab1a8f7 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/aio/operations/_edge_order_management_client_operations.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/aio/operations/_edge_order_management_client_operations.py @@ -489,16 +489,22 @@ async def get_next(next_link=None): def list_order_items_at_subscription_level( self, filter: Optional[str] = None, + expand: Optional[str] = None, skip_token: Optional[str] = None, **kwargs: Any ) -> AsyncIterable["_models.OrderItemResourceList"]: - """Lists order at subscription level. + """Lists order item at subscription level. :param filter: $filter is supported to filter based on order id. Filter supports only equals operation. :type filter: str - :param skip_token: $skipToken is supported on Get list of orders, which provides the next page - in the list of order. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. + :type expand: str + :param skip_token: $skipToken is supported on Get list of order items, which provides the next + page in the list of order items. :type skip_token: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OrderItemResourceList or the result of cls(response) @@ -530,6 +536,8 @@ def prepare_request(next_link=None): query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') if filter is not None: query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') + if expand is not None: + query_parameters['$expand'] = self._serialize.query("expand", expand, 'str') if skip_token is not None: query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str') @@ -1242,8 +1250,10 @@ def list_order_items_at_resource_group_level( :param filter: $filter is supported to filter based on order id. Filter supports only equals operation. :type filter: str - :param expand: $expand is supported on device details parameter for order item, which provides - details on the devices of the product. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. :type expand: str :param skip_token: $skipToken is supported on Get list of order items, which provides the next page in the list of order items. @@ -1329,8 +1339,10 @@ async def get_order_item_by_name( :type order_item_name: str :param resource_group_name: The name of the resource group. The name is case insensitive. :type resource_group_name: str - :param expand: $expand is supported on device details parameter for order item, which provides - details on the devices of the product. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. :type expand: str :keyword callable cls: A custom type or function that will be passed the direct response :return: OrderItemResource, or the result of cls(response) diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/__init__.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/__init__.py index 9a0ed92ff2fc..67915606ae5b 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/__init__.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/__init__.py @@ -35,6 +35,7 @@ from ._models_py3 import ErrorDetail from ._models_py3 import ErrorResponse from ._models_py3 import FilterableProperty + from ._models_py3 import ForwardShippingDetails from ._models_py3 import HierarchyInformation from ._models_py3 import ImageInformation from ._models_py3 import Link @@ -67,7 +68,9 @@ from ._models_py3 import PurchaseMeterDetails from ._models_py3 import Resource from ._models_py3 import ResourceIdentity + from ._models_py3 import ResourceProviderDetails from ._models_py3 import ReturnOrderItemDetails + from ._models_py3 import ReverseShippingDetails from ._models_py3 import ShippingAddress from ._models_py3 import ShippingDetails from ._models_py3 import Specification @@ -104,6 +107,7 @@ from ._models import ErrorDetail # type: ignore from ._models import ErrorResponse # type: ignore from ._models import FilterableProperty # type: ignore + from ._models import ForwardShippingDetails # type: ignore from ._models import HierarchyInformation # type: ignore from ._models import ImageInformation # type: ignore from ._models import Link # type: ignore @@ -136,7 +140,9 @@ from ._models import PurchaseMeterDetails # type: ignore from ._models import Resource # type: ignore from ._models import ResourceIdentity # type: ignore + from ._models import ResourceProviderDetails # type: ignore from ._models import ReturnOrderItemDetails # type: ignore + from ._models import ReverseShippingDetails # type: ignore from ._models import ShippingAddress # type: ignore from ._models import ShippingDetails # type: ignore from ._models import Specification # type: ignore @@ -201,6 +207,7 @@ 'ErrorDetail', 'ErrorResponse', 'FilterableProperty', + 'ForwardShippingDetails', 'HierarchyInformation', 'ImageInformation', 'Link', @@ -233,7 +240,9 @@ 'PurchaseMeterDetails', 'Resource', 'ResourceIdentity', + 'ResourceProviderDetails', 'ReturnOrderItemDetails', + 'ReverseShippingDetails', 'ShippingAddress', 'ShippingDetails', 'Specification', diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_edge_order_management_client_enums.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_edge_order_management_client_enums.py index 4f8839bebbd0..57c1b4255d38 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_edge_order_management_client_enums.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_edge_order_management_client_enums.py @@ -126,7 +126,8 @@ class DisabledReason(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): OUT_OF_STOCK = "OutOfStock" class DoubleEncryptionStatus(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Defines secondary layer of software-based encryption enablement. + """Double encryption status as entered by the customer. It is compulsory to give this parameter if + the 'Deny' or 'Disabled' policy is configured. """ #: Double encryption is disabled. @@ -192,7 +193,7 @@ class NotificationStageName(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)) DELIVERED = "Delivered" class OrderItemCancellationEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Describes whether the orderItem is cancellable or not. + """Describes whether the order item is cancellable or not. """ #: Order item can be cancelled without fee. @@ -203,7 +204,7 @@ class OrderItemCancellationEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, En NOT_CANCELLABLE = "NotCancellable" class OrderItemReturnEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): - """Describes whether the orderItem is returnable or not. + """Describes whether the order item is returnable or not. """ #: Order item can be returned without fee. diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models.py index fe82fbef85e6..8332d6d62eef 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models.py @@ -874,16 +874,20 @@ class DeviceDetails(msrest.serialization.Model): :vartype serial_number: str :ivar management_resource_id: Management Resource Id. :vartype management_resource_id: str + :ivar management_resource_tenant_id: Management Resource Tenant ID. + :vartype management_resource_tenant_id: str """ _validation = { 'serial_number': {'readonly': True}, 'management_resource_id': {'readonly': True}, + 'management_resource_tenant_id': {'readonly': True}, } _attribute_map = { 'serial_number': {'key': 'serialNumber', 'type': 'str'}, 'management_resource_id': {'key': 'managementResourceId', 'type': 'str'}, + 'management_resource_tenant_id': {'key': 'managementResourceTenantId', 'type': 'str'}, } def __init__( @@ -893,6 +897,7 @@ def __init__( super(DeviceDetails, self).__init__(**kwargs) self.serial_number = None self.management_resource_id = None + self.management_resource_tenant_id = None class Dimensions(msrest.serialization.Model): @@ -984,8 +989,9 @@ def __init__( class EncryptionPreferences(msrest.serialization.Model): """Preferences related to the double encryption. - :param double_encryption_status: Defines secondary layer of software-based encryption - enablement. Possible values include: "Disabled", "Enabled". Default value: "Disabled". + :param double_encryption_status: Double encryption status as entered by the customer. It is + compulsory to give this parameter if the 'Deny' or 'Disabled' policy is configured. Possible + values include: "Disabled", "Enabled". :type double_encryption_status: str or ~edge_order_management_client.models.DoubleEncryptionStatus """ @@ -999,7 +1005,7 @@ def __init__( **kwargs ): super(EncryptionPreferences, self).__init__(**kwargs) - self.double_encryption_status = kwargs.get('double_encryption_status', "Disabled") + self.double_encryption_status = kwargs.get('double_encryption_status', None) class ErrorAdditionalInfo(msrest.serialization.Model): @@ -1127,6 +1133,47 @@ def __init__( self.supported_values = kwargs['supported_values'] +class ForwardShippingDetails(msrest.serialization.Model): + """Forward shipment details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar carrier_name: Name of the carrier. + :vartype carrier_name: str + :ivar carrier_display_name: Carrier Name for display purpose. Not to be used for any + processing. + :vartype carrier_display_name: str + :ivar tracking_id: TrackingId of the package. + :vartype tracking_id: str + :ivar tracking_url: TrackingUrl of the package. + :vartype tracking_url: str + """ + + _validation = { + 'carrier_name': {'readonly': True}, + 'carrier_display_name': {'readonly': True}, + 'tracking_id': {'readonly': True}, + 'tracking_url': {'readonly': True}, + } + + _attribute_map = { + 'carrier_name': {'key': 'carrierName', 'type': 'str'}, + 'carrier_display_name': {'key': 'carrierDisplayName', 'type': 'str'}, + 'tracking_id': {'key': 'trackingId', 'type': 'str'}, + 'tracking_url': {'key': 'trackingUrl', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ForwardShippingDetails, self).__init__(**kwargs) + self.carrier_name = None + self.carrier_display_name = None + self.tracking_id = None + self.tracking_url = None + + class HierarchyInformation(msrest.serialization.Model): """Holds details about product hierarchy information. @@ -1459,14 +1506,14 @@ class OrderItemDetails(msrest.serialization.Model): :param preferences: Customer notification Preferences. :type preferences: ~edge_order_management_client.models.Preferences :ivar forward_shipping_details: Forward Package Shipping details. - :vartype forward_shipping_details: ~edge_order_management_client.models.ShippingDetails + :vartype forward_shipping_details: ~edge_order_management_client.models.ForwardShippingDetails :ivar reverse_shipping_details: Reverse Package Shipping details. - :vartype reverse_shipping_details: ~edge_order_management_client.models.ShippingDetails + :vartype reverse_shipping_details: ~edge_order_management_client.models.ReverseShippingDetails :param notification_email_list: Additional notification email list. :type notification_email_list: list[str] :ivar cancellation_reason: Cancellation reason. :vartype cancellation_reason: str - :ivar cancellation_status: Describes whether the orderItem is cancellable or not. Possible + :ivar cancellation_status: Describes whether the order item is cancellable or not. Possible values include: "Cancellable", "CancellableWithFee", "NotCancellable". :vartype cancellation_status: str or ~edge_order_management_client.models.OrderItemCancellationEnum @@ -1475,11 +1522,15 @@ class OrderItemDetails(msrest.serialization.Model): :vartype deletion_status: str or ~edge_order_management_client.models.ActionStatusEnum :ivar return_reason: Return reason. :vartype return_reason: str - :ivar return_status: Describes whether the orderItem is returnable or not. Possible values + :ivar return_status: Describes whether the order item is returnable or not. Possible values include: "Returnable", "ReturnableWithFee", "NotReturnable". :vartype return_status: str or ~edge_order_management_client.models.OrderItemReturnEnum - :ivar management_rp_details: parent RP details. - :vartype management_rp_details: any + :ivar management_rp_details: Parent RP details - this returns only the first or default parent + RP from the entire list. + :vartype management_rp_details: ~edge_order_management_client.models.ResourceProviderDetails + :ivar management_rp_details_list: List of parent RP details supported for configuration. + :vartype management_rp_details_list: + list[~edge_order_management_client.models.ResourceProviderDetails] :ivar error: Top level error for the job. :vartype error: ~edge_order_management_client.models.ErrorDetail """ @@ -1497,6 +1548,7 @@ class OrderItemDetails(msrest.serialization.Model): 'return_reason': {'readonly': True}, 'return_status': {'readonly': True}, 'management_rp_details': {'readonly': True}, + 'management_rp_details_list': {'readonly': True}, 'error': {'readonly': True}, } @@ -1506,15 +1558,16 @@ class OrderItemDetails(msrest.serialization.Model): 'current_stage': {'key': 'currentStage', 'type': 'StageDetails'}, 'order_item_stage_history': {'key': 'orderItemStageHistory', 'type': '[StageDetails]'}, 'preferences': {'key': 'preferences', 'type': 'Preferences'}, - 'forward_shipping_details': {'key': 'forwardShippingDetails', 'type': 'ShippingDetails'}, - 'reverse_shipping_details': {'key': 'reverseShippingDetails', 'type': 'ShippingDetails'}, + 'forward_shipping_details': {'key': 'forwardShippingDetails', 'type': 'ForwardShippingDetails'}, + 'reverse_shipping_details': {'key': 'reverseShippingDetails', 'type': 'ReverseShippingDetails'}, 'notification_email_list': {'key': 'notificationEmailList', 'type': '[str]'}, 'cancellation_reason': {'key': 'cancellationReason', 'type': 'str'}, 'cancellation_status': {'key': 'cancellationStatus', 'type': 'str'}, 'deletion_status': {'key': 'deletionStatus', 'type': 'str'}, 'return_reason': {'key': 'returnReason', 'type': 'str'}, 'return_status': {'key': 'returnStatus', 'type': 'str'}, - 'management_rp_details': {'key': 'managementRpDetails', 'type': 'object'}, + 'management_rp_details': {'key': 'managementRpDetails', 'type': 'ResourceProviderDetails'}, + 'management_rp_details_list': {'key': 'managementRpDetailsList', 'type': '[ResourceProviderDetails]'}, 'error': {'key': 'error', 'type': 'ErrorDetail'}, } @@ -1537,6 +1590,7 @@ def __init__( self.return_reason = None self.return_status = None self.management_rp_details = None + self.management_rp_details_list = None self.error = None @@ -1932,14 +1986,20 @@ class ProductDetails(msrest.serialization.Model): :param hierarchy_information: Required. Hierarchy of the product which uniquely identifies the product. :type hierarchy_information: ~edge_order_management_client.models.HierarchyInformation - :param count: Quantity of the product. - :type count: int + :ivar count: Quantity of the product. + :vartype count: int + :ivar product_double_encryption_status: Double encryption status of the configuration. + Read-only field. Possible values include: "Disabled", "Enabled". + :vartype product_double_encryption_status: str or + ~edge_order_management_client.models.DoubleEncryptionStatus :ivar device_details: list of device details. :vartype device_details: list[~edge_order_management_client.models.DeviceDetails] """ _validation = { 'hierarchy_information': {'required': True}, + 'count': {'readonly': True}, + 'product_double_encryption_status': {'readonly': True}, 'device_details': {'readonly': True}, } @@ -1947,6 +2007,7 @@ class ProductDetails(msrest.serialization.Model): 'display_info': {'key': 'displayInfo', 'type': 'DisplayInfo'}, 'hierarchy_information': {'key': 'hierarchyInformation', 'type': 'HierarchyInformation'}, 'count': {'key': 'count', 'type': 'int'}, + 'product_double_encryption_status': {'key': 'productDoubleEncryptionStatus', 'type': 'str'}, 'device_details': {'key': 'deviceDetails', 'type': '[DeviceDetails]'}, } @@ -1957,7 +2018,8 @@ def __init__( super(ProductDetails, self).__init__(**kwargs) self.display_info = kwargs.get('display_info', None) self.hierarchy_information = kwargs['hierarchy_information'] - self.count = kwargs.get('count', None) + self.count = None + self.product_double_encryption_status = None self.device_details = None @@ -2041,6 +2103,9 @@ class ProductFamiliesMetadataDetails(msrest.serialization.Model): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2063,6 +2128,7 @@ class ProductFamiliesMetadataDetails(msrest.serialization.Model): 'hierarchy_information': {'key': 'properties.hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'properties.filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'properties.productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'properties.resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( @@ -2078,6 +2144,7 @@ def __init__( self.hierarchy_information = None self.filterable_properties = None self.product_lines = None + self.resource_provider_details = kwargs.get('resource_provider_details', None) class ProductFamiliesRequest(msrest.serialization.Model): @@ -2133,6 +2200,9 @@ class ProductFamily(msrest.serialization.Model): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2155,6 +2225,7 @@ class ProductFamily(msrest.serialization.Model): 'hierarchy_information': {'key': 'properties.hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'properties.filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'properties.productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'properties.resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( @@ -2170,6 +2241,7 @@ def __init__( self.hierarchy_information = None self.filterable_properties = None self.product_lines = None + self.resource_provider_details = kwargs.get('resource_provider_details', None) class ProductFamilyProperties(CommonProperties): @@ -2193,6 +2265,9 @@ class ProductFamilyProperties(CommonProperties): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2215,6 +2290,7 @@ class ProductFamilyProperties(CommonProperties): 'hierarchy_information': {'key': 'hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( @@ -2223,6 +2299,7 @@ def __init__( ): super(ProductFamilyProperties, self).__init__(**kwargs) self.product_lines = None + self.resource_provider_details = kwargs.get('resource_provider_details', None) class ProductLine(msrest.serialization.Model): @@ -2476,6 +2553,31 @@ def __init__( self.tenant_id = None +class ResourceProviderDetails(msrest.serialization.Model): + """Management RP details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar resource_provider_namespace: Resource provider namespace. + :vartype resource_provider_namespace: str + """ + + _validation = { + 'resource_provider_namespace': {'readonly': True}, + } + + _attribute_map = { + 'resource_provider_namespace': {'key': 'resourceProviderNamespace', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ResourceProviderDetails, self).__init__(**kwargs) + self.resource_provider_namespace = None + + class ReturnOrderItemDetails(msrest.serialization.Model): """Return order item request body. @@ -2485,6 +2587,10 @@ class ReturnOrderItemDetails(msrest.serialization.Model): :type return_address: ~edge_order_management_client.models.AddressProperties :param return_reason: Required. Return Reason. :type return_reason: str + :param service_tag: Service tag (located on the bottom-right corner of the device). + :type service_tag: str + :param shipping_box_required: Shipping Box required. + :type shipping_box_required: bool """ _validation = { @@ -2494,6 +2600,8 @@ class ReturnOrderItemDetails(msrest.serialization.Model): _attribute_map = { 'return_address': {'key': 'returnAddress', 'type': 'AddressProperties'}, 'return_reason': {'key': 'returnReason', 'type': 'str'}, + 'service_tag': {'key': 'serviceTag', 'type': 'str'}, + 'shipping_box_required': {'key': 'shippingBoxRequired', 'type': 'bool'}, } def __init__( @@ -2503,6 +2611,54 @@ def __init__( super(ReturnOrderItemDetails, self).__init__(**kwargs) self.return_address = kwargs.get('return_address', None) self.return_reason = kwargs['return_reason'] + self.service_tag = kwargs.get('service_tag', None) + self.shipping_box_required = kwargs.get('shipping_box_required', False) + + +class ReverseShippingDetails(msrest.serialization.Model): + """Reverse shipment details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar sas_key_for_label: SAS key to download the reverse shipment label of the package. + :vartype sas_key_for_label: str + :ivar carrier_name: Name of the carrier. + :vartype carrier_name: str + :ivar carrier_display_name: Carrier Name for display purpose. Not to be used for any + processing. + :vartype carrier_display_name: str + :ivar tracking_id: TrackingId of the package. + :vartype tracking_id: str + :ivar tracking_url: TrackingUrl of the package. + :vartype tracking_url: str + """ + + _validation = { + 'sas_key_for_label': {'readonly': True}, + 'carrier_name': {'readonly': True}, + 'carrier_display_name': {'readonly': True}, + 'tracking_id': {'readonly': True}, + 'tracking_url': {'readonly': True}, + } + + _attribute_map = { + 'sas_key_for_label': {'key': 'sasKeyForLabel', 'type': 'str'}, + 'carrier_name': {'key': 'carrierName', 'type': 'str'}, + 'carrier_display_name': {'key': 'carrierDisplayName', 'type': 'str'}, + 'tracking_id': {'key': 'trackingId', 'type': 'str'}, + 'tracking_url': {'key': 'trackingUrl', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ReverseShippingDetails, self).__init__(**kwargs) + self.sas_key_for_label = None + self.carrier_name = None + self.carrier_display_name = None + self.tracking_id = None + self.tracking_url = None class ShippingAddress(msrest.serialization.Model): diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models_py3.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models_py3.py index 34e5d4273902..7ebdca194e0f 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models_py3.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/models/_models_py3.py @@ -921,16 +921,20 @@ class DeviceDetails(msrest.serialization.Model): :vartype serial_number: str :ivar management_resource_id: Management Resource Id. :vartype management_resource_id: str + :ivar management_resource_tenant_id: Management Resource Tenant ID. + :vartype management_resource_tenant_id: str """ _validation = { 'serial_number': {'readonly': True}, 'management_resource_id': {'readonly': True}, + 'management_resource_tenant_id': {'readonly': True}, } _attribute_map = { 'serial_number': {'key': 'serialNumber', 'type': 'str'}, 'management_resource_id': {'key': 'managementResourceId', 'type': 'str'}, + 'management_resource_tenant_id': {'key': 'managementResourceTenantId', 'type': 'str'}, } def __init__( @@ -940,6 +944,7 @@ def __init__( super(DeviceDetails, self).__init__(**kwargs) self.serial_number = None self.management_resource_id = None + self.management_resource_tenant_id = None class Dimensions(msrest.serialization.Model): @@ -1031,8 +1036,9 @@ def __init__( class EncryptionPreferences(msrest.serialization.Model): """Preferences related to the double encryption. - :param double_encryption_status: Defines secondary layer of software-based encryption - enablement. Possible values include: "Disabled", "Enabled". Default value: "Disabled". + :param double_encryption_status: Double encryption status as entered by the customer. It is + compulsory to give this parameter if the 'Deny' or 'Disabled' policy is configured. Possible + values include: "Disabled", "Enabled". :type double_encryption_status: str or ~edge_order_management_client.models.DoubleEncryptionStatus """ @@ -1044,7 +1050,7 @@ class EncryptionPreferences(msrest.serialization.Model): def __init__( self, *, - double_encryption_status: Optional[Union[str, "DoubleEncryptionStatus"]] = "Disabled", + double_encryption_status: Optional[Union[str, "DoubleEncryptionStatus"]] = None, **kwargs ): super(EncryptionPreferences, self).__init__(**kwargs) @@ -1181,6 +1187,47 @@ def __init__( self.supported_values = supported_values +class ForwardShippingDetails(msrest.serialization.Model): + """Forward shipment details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar carrier_name: Name of the carrier. + :vartype carrier_name: str + :ivar carrier_display_name: Carrier Name for display purpose. Not to be used for any + processing. + :vartype carrier_display_name: str + :ivar tracking_id: TrackingId of the package. + :vartype tracking_id: str + :ivar tracking_url: TrackingUrl of the package. + :vartype tracking_url: str + """ + + _validation = { + 'carrier_name': {'readonly': True}, + 'carrier_display_name': {'readonly': True}, + 'tracking_id': {'readonly': True}, + 'tracking_url': {'readonly': True}, + } + + _attribute_map = { + 'carrier_name': {'key': 'carrierName', 'type': 'str'}, + 'carrier_display_name': {'key': 'carrierDisplayName', 'type': 'str'}, + 'tracking_id': {'key': 'trackingId', 'type': 'str'}, + 'tracking_url': {'key': 'trackingUrl', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ForwardShippingDetails, self).__init__(**kwargs) + self.carrier_name = None + self.carrier_display_name = None + self.tracking_id = None + self.tracking_url = None + + class HierarchyInformation(msrest.serialization.Model): """Holds details about product hierarchy information. @@ -1525,14 +1572,14 @@ class OrderItemDetails(msrest.serialization.Model): :param preferences: Customer notification Preferences. :type preferences: ~edge_order_management_client.models.Preferences :ivar forward_shipping_details: Forward Package Shipping details. - :vartype forward_shipping_details: ~edge_order_management_client.models.ShippingDetails + :vartype forward_shipping_details: ~edge_order_management_client.models.ForwardShippingDetails :ivar reverse_shipping_details: Reverse Package Shipping details. - :vartype reverse_shipping_details: ~edge_order_management_client.models.ShippingDetails + :vartype reverse_shipping_details: ~edge_order_management_client.models.ReverseShippingDetails :param notification_email_list: Additional notification email list. :type notification_email_list: list[str] :ivar cancellation_reason: Cancellation reason. :vartype cancellation_reason: str - :ivar cancellation_status: Describes whether the orderItem is cancellable or not. Possible + :ivar cancellation_status: Describes whether the order item is cancellable or not. Possible values include: "Cancellable", "CancellableWithFee", "NotCancellable". :vartype cancellation_status: str or ~edge_order_management_client.models.OrderItemCancellationEnum @@ -1541,11 +1588,15 @@ class OrderItemDetails(msrest.serialization.Model): :vartype deletion_status: str or ~edge_order_management_client.models.ActionStatusEnum :ivar return_reason: Return reason. :vartype return_reason: str - :ivar return_status: Describes whether the orderItem is returnable or not. Possible values + :ivar return_status: Describes whether the order item is returnable or not. Possible values include: "Returnable", "ReturnableWithFee", "NotReturnable". :vartype return_status: str or ~edge_order_management_client.models.OrderItemReturnEnum - :ivar management_rp_details: parent RP details. - :vartype management_rp_details: any + :ivar management_rp_details: Parent RP details - this returns only the first or default parent + RP from the entire list. + :vartype management_rp_details: ~edge_order_management_client.models.ResourceProviderDetails + :ivar management_rp_details_list: List of parent RP details supported for configuration. + :vartype management_rp_details_list: + list[~edge_order_management_client.models.ResourceProviderDetails] :ivar error: Top level error for the job. :vartype error: ~edge_order_management_client.models.ErrorDetail """ @@ -1563,6 +1614,7 @@ class OrderItemDetails(msrest.serialization.Model): 'return_reason': {'readonly': True}, 'return_status': {'readonly': True}, 'management_rp_details': {'readonly': True}, + 'management_rp_details_list': {'readonly': True}, 'error': {'readonly': True}, } @@ -1572,15 +1624,16 @@ class OrderItemDetails(msrest.serialization.Model): 'current_stage': {'key': 'currentStage', 'type': 'StageDetails'}, 'order_item_stage_history': {'key': 'orderItemStageHistory', 'type': '[StageDetails]'}, 'preferences': {'key': 'preferences', 'type': 'Preferences'}, - 'forward_shipping_details': {'key': 'forwardShippingDetails', 'type': 'ShippingDetails'}, - 'reverse_shipping_details': {'key': 'reverseShippingDetails', 'type': 'ShippingDetails'}, + 'forward_shipping_details': {'key': 'forwardShippingDetails', 'type': 'ForwardShippingDetails'}, + 'reverse_shipping_details': {'key': 'reverseShippingDetails', 'type': 'ReverseShippingDetails'}, 'notification_email_list': {'key': 'notificationEmailList', 'type': '[str]'}, 'cancellation_reason': {'key': 'cancellationReason', 'type': 'str'}, 'cancellation_status': {'key': 'cancellationStatus', 'type': 'str'}, 'deletion_status': {'key': 'deletionStatus', 'type': 'str'}, 'return_reason': {'key': 'returnReason', 'type': 'str'}, 'return_status': {'key': 'returnStatus', 'type': 'str'}, - 'management_rp_details': {'key': 'managementRpDetails', 'type': 'object'}, + 'management_rp_details': {'key': 'managementRpDetails', 'type': 'ResourceProviderDetails'}, + 'management_rp_details_list': {'key': 'managementRpDetailsList', 'type': '[ResourceProviderDetails]'}, 'error': {'key': 'error', 'type': 'ErrorDetail'}, } @@ -1608,6 +1661,7 @@ def __init__( self.return_reason = None self.return_status = None self.management_rp_details = None + self.management_rp_details_list = None self.error = None @@ -2023,14 +2077,20 @@ class ProductDetails(msrest.serialization.Model): :param hierarchy_information: Required. Hierarchy of the product which uniquely identifies the product. :type hierarchy_information: ~edge_order_management_client.models.HierarchyInformation - :param count: Quantity of the product. - :type count: int + :ivar count: Quantity of the product. + :vartype count: int + :ivar product_double_encryption_status: Double encryption status of the configuration. + Read-only field. Possible values include: "Disabled", "Enabled". + :vartype product_double_encryption_status: str or + ~edge_order_management_client.models.DoubleEncryptionStatus :ivar device_details: list of device details. :vartype device_details: list[~edge_order_management_client.models.DeviceDetails] """ _validation = { 'hierarchy_information': {'required': True}, + 'count': {'readonly': True}, + 'product_double_encryption_status': {'readonly': True}, 'device_details': {'readonly': True}, } @@ -2038,6 +2098,7 @@ class ProductDetails(msrest.serialization.Model): 'display_info': {'key': 'displayInfo', 'type': 'DisplayInfo'}, 'hierarchy_information': {'key': 'hierarchyInformation', 'type': 'HierarchyInformation'}, 'count': {'key': 'count', 'type': 'int'}, + 'product_double_encryption_status': {'key': 'productDoubleEncryptionStatus', 'type': 'str'}, 'device_details': {'key': 'deviceDetails', 'type': '[DeviceDetails]'}, } @@ -2046,13 +2107,13 @@ def __init__( *, hierarchy_information: "HierarchyInformation", display_info: Optional["DisplayInfo"] = None, - count: Optional[int] = None, **kwargs ): super(ProductDetails, self).__init__(**kwargs) self.display_info = display_info self.hierarchy_information = hierarchy_information - self.count = count + self.count = None + self.product_double_encryption_status = None self.device_details = None @@ -2138,6 +2199,9 @@ class ProductFamiliesMetadataDetails(msrest.serialization.Model): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2160,10 +2224,13 @@ class ProductFamiliesMetadataDetails(msrest.serialization.Model): 'hierarchy_information': {'key': 'properties.hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'properties.filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'properties.productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'properties.resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( self, + *, + resource_provider_details: Optional[List["ResourceProviderDetails"]] = None, **kwargs ): super(ProductFamiliesMetadataDetails, self).__init__(**kwargs) @@ -2175,6 +2242,7 @@ def __init__( self.hierarchy_information = None self.filterable_properties = None self.product_lines = None + self.resource_provider_details = resource_provider_details class ProductFamiliesRequest(msrest.serialization.Model): @@ -2233,6 +2301,9 @@ class ProductFamily(msrest.serialization.Model): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2255,10 +2326,13 @@ class ProductFamily(msrest.serialization.Model): 'hierarchy_information': {'key': 'properties.hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'properties.filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'properties.productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'properties.resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( self, + *, + resource_provider_details: Optional[List["ResourceProviderDetails"]] = None, **kwargs ): super(ProductFamily, self).__init__(**kwargs) @@ -2270,6 +2344,7 @@ def __init__( self.hierarchy_information = None self.filterable_properties = None self.product_lines = None + self.resource_provider_details = resource_provider_details class ProductFamilyProperties(CommonProperties): @@ -2293,6 +2368,9 @@ class ProductFamilyProperties(CommonProperties): :vartype filterable_properties: list[~edge_order_management_client.models.FilterableProperty] :ivar product_lines: List of product lines supported in the product family. :vartype product_lines: list[~edge_order_management_client.models.ProductLine] + :param resource_provider_details: Contains details related to resource provider. + :type resource_provider_details: + list[~edge_order_management_client.models.ResourceProviderDetails] """ _validation = { @@ -2315,14 +2393,18 @@ class ProductFamilyProperties(CommonProperties): 'hierarchy_information': {'key': 'hierarchyInformation', 'type': 'HierarchyInformation'}, 'filterable_properties': {'key': 'filterableProperties', 'type': '[FilterableProperty]'}, 'product_lines': {'key': 'productLines', 'type': '[ProductLine]'}, + 'resource_provider_details': {'key': 'resourceProviderDetails', 'type': '[ResourceProviderDetails]'}, } def __init__( self, + *, + resource_provider_details: Optional[List["ResourceProviderDetails"]] = None, **kwargs ): super(ProductFamilyProperties, self).__init__(**kwargs) self.product_lines = None + self.resource_provider_details = resource_provider_details class ProductLine(msrest.serialization.Model): @@ -2578,6 +2660,31 @@ def __init__( self.tenant_id = None +class ResourceProviderDetails(msrest.serialization.Model): + """Management RP details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar resource_provider_namespace: Resource provider namespace. + :vartype resource_provider_namespace: str + """ + + _validation = { + 'resource_provider_namespace': {'readonly': True}, + } + + _attribute_map = { + 'resource_provider_namespace': {'key': 'resourceProviderNamespace', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ResourceProviderDetails, self).__init__(**kwargs) + self.resource_provider_namespace = None + + class ReturnOrderItemDetails(msrest.serialization.Model): """Return order item request body. @@ -2587,6 +2694,10 @@ class ReturnOrderItemDetails(msrest.serialization.Model): :type return_address: ~edge_order_management_client.models.AddressProperties :param return_reason: Required. Return Reason. :type return_reason: str + :param service_tag: Service tag (located on the bottom-right corner of the device). + :type service_tag: str + :param shipping_box_required: Shipping Box required. + :type shipping_box_required: bool """ _validation = { @@ -2596,6 +2707,8 @@ class ReturnOrderItemDetails(msrest.serialization.Model): _attribute_map = { 'return_address': {'key': 'returnAddress', 'type': 'AddressProperties'}, 'return_reason': {'key': 'returnReason', 'type': 'str'}, + 'service_tag': {'key': 'serviceTag', 'type': 'str'}, + 'shipping_box_required': {'key': 'shippingBoxRequired', 'type': 'bool'}, } def __init__( @@ -2603,11 +2716,61 @@ def __init__( *, return_reason: str, return_address: Optional["AddressProperties"] = None, + service_tag: Optional[str] = None, + shipping_box_required: Optional[bool] = False, **kwargs ): super(ReturnOrderItemDetails, self).__init__(**kwargs) self.return_address = return_address self.return_reason = return_reason + self.service_tag = service_tag + self.shipping_box_required = shipping_box_required + + +class ReverseShippingDetails(msrest.serialization.Model): + """Reverse shipment details. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar sas_key_for_label: SAS key to download the reverse shipment label of the package. + :vartype sas_key_for_label: str + :ivar carrier_name: Name of the carrier. + :vartype carrier_name: str + :ivar carrier_display_name: Carrier Name for display purpose. Not to be used for any + processing. + :vartype carrier_display_name: str + :ivar tracking_id: TrackingId of the package. + :vartype tracking_id: str + :ivar tracking_url: TrackingUrl of the package. + :vartype tracking_url: str + """ + + _validation = { + 'sas_key_for_label': {'readonly': True}, + 'carrier_name': {'readonly': True}, + 'carrier_display_name': {'readonly': True}, + 'tracking_id': {'readonly': True}, + 'tracking_url': {'readonly': True}, + } + + _attribute_map = { + 'sas_key_for_label': {'key': 'sasKeyForLabel', 'type': 'str'}, + 'carrier_name': {'key': 'carrierName', 'type': 'str'}, + 'carrier_display_name': {'key': 'carrierDisplayName', 'type': 'str'}, + 'tracking_id': {'key': 'trackingId', 'type': 'str'}, + 'tracking_url': {'key': 'trackingUrl', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ReverseShippingDetails, self).__init__(**kwargs) + self.sas_key_for_label = None + self.carrier_name = None + self.carrier_display_name = None + self.tracking_id = None + self.tracking_url = None class ShippingAddress(msrest.serialization.Model): diff --git a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/operations/_edge_order_management_client_operations.py b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/operations/_edge_order_management_client_operations.py index d722e59540b2..a6b2c4e79547 100644 --- a/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/operations/_edge_order_management_client_operations.py +++ b/sdk/edgeorder/azure-mgmt-edgeorder/azure/mgmt/edgeorder/operations/_edge_order_management_client_operations.py @@ -499,17 +499,23 @@ def get_next(next_link=None): def list_order_items_at_subscription_level( self, filter=None, # type: Optional[str] + expand=None, # type: Optional[str] skip_token=None, # type: Optional[str] **kwargs # type: Any ): # type: (...) -> Iterable["_models.OrderItemResourceList"] - """Lists order at subscription level. + """Lists order item at subscription level. :param filter: $filter is supported to filter based on order id. Filter supports only equals operation. :type filter: str - :param skip_token: $skipToken is supported on Get list of orders, which provides the next page - in the list of order. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. + :type expand: str + :param skip_token: $skipToken is supported on Get list of order items, which provides the next + page in the list of order items. :type skip_token: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OrderItemResourceList or the result of cls(response) @@ -541,6 +547,8 @@ def prepare_request(next_link=None): query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') if filter is not None: query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') + if expand is not None: + query_parameters['$expand'] = self._serialize.query("expand", expand, 'str') if skip_token is not None: query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str') @@ -1264,8 +1272,10 @@ def list_order_items_at_resource_group_level( :param filter: $filter is supported to filter based on order id. Filter supports only equals operation. :type filter: str - :param expand: $expand is supported on device details parameter for order item, which provides - details on the devices of the product. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. :type expand: str :param skip_token: $skipToken is supported on Get list of order items, which provides the next page in the list of order items. @@ -1352,8 +1362,10 @@ def get_order_item_by_name( :type order_item_name: str :param resource_group_name: The name of the resource group. The name is case insensitive. :type resource_group_name: str - :param expand: $expand is supported on device details parameter for order item, which provides - details on the devices of the product. + :param expand: $expand is supported on device details, forward shipping details and reverse + shipping details parameters. Each of these can be provided as a comma separated list. Device + Details for order item provides details on the devices of the product, Forward and Reverse + Shipping details provide forward and reverse shipping details respectively. :type expand: str :keyword callable cls: A custom type or function that will be passed the direct response :return: OrderItemResource, or the result of cls(response)