diff --git a/sdk/azurestack/azure-mgmt-azurestack/CHANGELOG.md b/sdk/azurestack/azure-mgmt-azurestack/CHANGELOG.md index 7e89fb88ca5f..1ebfea172814 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/CHANGELOG.md +++ b/sdk/azurestack/azure-mgmt-azurestack/CHANGELOG.md @@ -1,5 +1,54 @@ # Release History +## 2.0.0 (2025-04-25) + +### Features Added + + - Client `AzureStackManagementClient` added operation group `deployment_license` + - Added model `DeploymentLicenseRequest` + - Added model `DeploymentLicenseResponse` + - Model `CloudManifestFileOperations` added parameter `kwargs` in method `__init__` + - Model `CustomerSubscriptionsOperations` added parameter `kwargs` in method `__init__` + - Model `Operations` added parameter `kwargs` in method `__init__` + - Model `ProductsOperations` added parameter `kwargs` in method `__init__` + - Model `ProductsOperations` added method `list_products` + - Model `RegistrationsOperations` added parameter `kwargs` in method `__init__` + - Model `RegistrationsOperations` added method `list_by_subscription` + - Added model `DeploymentLicenseOperations` + - Method `CustomerSubscriptionsOperations.create` has a new overload `def create(self: None, resource_group: str, registration_name: str, customer_subscription_name: str, customer_creation_parameters: CustomerSubscription, content_type: str)` + - Method `CustomerSubscriptionsOperations.create` has a new overload `def create(self: None, resource_group: str, registration_name: str, customer_subscription_name: str, customer_creation_parameters: IO[bytes], content_type: str)` + - Method `ProductsOperations.get_product` has a new overload `def get_product(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[DeviceConfiguration], content_type: str)` + - Method `ProductsOperations.get_product` has a new overload `def get_product(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[IO[bytes]], content_type: str)` + - Method `ProductsOperations.get_products` has a new overload `def get_products(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[DeviceConfiguration], content_type: str)` + - Method `ProductsOperations.get_products` has a new overload `def get_products(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[IO[bytes]], content_type: str)` + - Method `ProductsOperations.upload_log` has a new overload `def upload_log(self: None, resource_group: str, registration_name: str, product_name: str, marketplace_product_log_update: Optional[MarketplaceProductLogUpdate], content_type: str)` + - Method `ProductsOperations.upload_log` has a new overload `def upload_log(self: None, resource_group: str, registration_name: str, product_name: str, marketplace_product_log_update: Optional[IO[bytes]], content_type: str)` + - Method `ProductsOperations.list_products` has a new overload `def list_products(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[DeviceConfiguration], content_type: str)` + - Method `ProductsOperations.list_products` has a new overload `def list_products(self: None, resource_group: str, registration_name: str, product_name: str, device_configuration: Optional[IO[bytes]], content_type: str)` + - Method `RegistrationsOperations.create_or_update` has a new overload `def create_or_update(self: None, resource_group: str, registration_name: str, token: RegistrationParameter, content_type: str)` + - Method `RegistrationsOperations.create_or_update` has a new overload `def create_or_update(self: None, resource_group: str, registration_name: str, token: IO[bytes], content_type: str)` + - Method `RegistrationsOperations.update` has a new overload `def update(self: None, resource_group: str, registration_name: str, token: RegistrationParameter, content_type: str)` + - Method `RegistrationsOperations.update` has a new overload `def update(self: None, resource_group: str, registration_name: str, token: IO[bytes], content_type: str)` + - Method `DeploymentLicenseOperations.create` has a new overload `def create(self: None, deployment_license_request: DeploymentLicenseRequest, content_type: str)` + - Method `DeploymentLicenseOperations.create` has a new overload `def create(self: None, deployment_license_request: IO[bytes], content_type: str)` + +### Breaking Changes + + - Deleted or renamed client operation group `AzureStackManagementClient.linked_subscriptions` + - Model `CustomerSubscription` deleted or renamed its instance variable `system_data` + - Deleted or renamed enum value `Location.GLOBAL_ENUM` + - Model `Product` deleted or renamed its instance variable `system_data` + - Model `Registration` deleted or renamed its instance variable `kind` + - Model `Registration` deleted or renamed its instance variable `system_data` + - Model `TrackedResource` deleted or renamed its instance variable `kind` + - Model `TrackedResource` deleted or renamed its instance variable `system_data` + - Deleted or renamed model `CreatedByType` + - Deleted or renamed model `LinkedSubscription` + - Deleted or renamed model `LinkedSubscriptionParameter` + - Deleted or renamed model `LinkedSubscriptionsList` + - Deleted or renamed model `SystemData` + - Deleted or renamed model `LinkedSubscriptionsOperations` + ## 2.0.0b1 (2022-11-17) ### Features Added diff --git a/sdk/azurestack/azure-mgmt-azurestack/README.md b/sdk/azurestack/azure-mgmt-azurestack/README.md index 10166ce80523..a5a29cb3118a 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/README.md +++ b/sdk/azurestack/azure-mgmt-azurestack/README.md @@ -1,28 +1,61 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Azure Stack Management Client Library. -This package has been tested with Python 3.7+. +This package has been tested with Python 3.9+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_ -# Usage +## Getting started +### Prerequisites -To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt) - -For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/) -Code samples for this package can be found at [Azure Stack Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com. -Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) +- Python 3.9+ is required to use this package. +- [Azure subscription](https://azure.microsoft.com/free/) +### Install the package -# Provide Feedback +```bash +pip install azure-mgmt-azurestack +pip install azure-identity +``` -If you encounter any bugs or have suggestions, please file an issue in the -[Issues](https://github.com/Azure/azure-sdk-for-python/issues) -section of the project. +### Authentication + +By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables. + +- `AZURE_CLIENT_ID` for Azure client ID. +- `AZURE_TENANT_ID` for Azure tenant ID. +- `AZURE_CLIENT_SECRET` for Azure client secret. + +In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`. + +With above configuration, client can be authenticated by following code: + +```python +from azure.identity import DefaultAzureCredential +from azure.mgmt.azurestack import AzureStackManagementClient +import os +sub_id = os.getenv("AZURE_SUBSCRIPTION_ID") +client = AzureStackManagementClient(credential=DefaultAzureCredential(), subscription_id=sub_id) +``` +## Examples +Code samples for this package can be found at: +- [Search Azure Stack Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com +- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) + + +## Troubleshooting + +## Next steps + +## Provide Feedback + +If you encounter any bugs or have suggestions, please file an issue in the +[Issues](https://github.com/Azure/azure-sdk-for-python/issues) +section of the project. diff --git a/sdk/azurestack/azure-mgmt-azurestack/_meta.json b/sdk/azurestack/azure-mgmt-azurestack/_meta.json index b14576d1870f..dbed2ad13d6e 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/_meta.json +++ b/sdk/azurestack/azure-mgmt-azurestack/_meta.json @@ -1,11 +1,11 @@ { - "commit": "b32e1896f30e6ea155449cb49719a6286e32b961", + "commit": "4c6d0481729ff095999f4edf219bd68f9347d719", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest": "3.9.2", + "autorest": "3.10.2", "use": [ - "@autorest/python@6.2.7", - "@autorest/modelerfour@4.24.3" + "@autorest/python@6.34.1", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/azurestack/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/azurestack/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.34.1 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/azurestack/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/__init__.py index f823c526bf23..97fd2715d53e 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/__init__.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/__init__.py @@ -5,15 +5,21 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._azure_stack_management_client import AzureStackManagementClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._azure_stack_management_client import AzureStackManagementClient # type: ignore from ._version import VERSION __version__ = VERSION try: from ._patch import __all__ as _patch_all - from ._patch import * # pylint: disable=unused-wildcard-import + from ._patch import * except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk @@ -21,6 +27,6 @@ __all__ = [ "AzureStackManagementClient", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_azure_stack_management_client.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_azure_stack_management_client.py index c8037cb29445..ad2ce25eb657 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_azure_stack_management_client.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_azure_stack_management_client.py @@ -7,14 +7,19 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING, cast +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse +from azure.core.settings import settings from azure.mgmt.core import ARMPipelineClient +from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints from . import models as _models from ._configuration import AzureStackManagementClientConfiguration -from ._serialization import Deserializer, Serializer +from ._utils.serialization import Deserializer, Serializer from .operations import ( CloudManifestFileOperations, CustomerSubscriptionsOperations, @@ -25,11 +30,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class AzureStackManagementClient: # pylint: disable=client-accepts-api-version-keyword +class AzureStackManagementClient: """Azure Stack. :ivar operations: Operations operations @@ -50,7 +54,7 @@ class AzureStackManagementClient: # pylint: disable=client-accepts-api-version- :param subscription_id: Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. Required. :type subscription_id: str - :param base_url: Service URL. Default value is "https://management.azure.com". + :param base_url: Service URL. Default value is None. :type base_url: str :keyword api_version: Api Version. Default value is "2022-06-01". Note that overriding this default value may result in unsupported behavior. @@ -58,16 +62,36 @@ class AzureStackManagementClient: # pylint: disable=client-accepts-api-version- """ def __init__( - self, - credential: "TokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = AzureStackManagementClientConfiguration( - credential=credential, subscription_id=subscription_id, **kwargs + credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs ) - self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + ARMAutoResourceProviderRegistrationPolicy(), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) @@ -86,7 +110,7 @@ def __init__( self.products = ProductsOperations(self._client, self._config, self._serialize, self._deserialize) self.registrations = RegistrationsOperations(self._client, self._config, self._serialize, self._deserialize) - def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: + def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. >>> from azure.core.rest import HttpRequest @@ -106,14 +130,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: request_copy = deepcopy(request) request_copy.url = self._client.format_url(request_copy.url) - return self._client.send_request(request_copy, **kwargs) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore def close(self) -> None: self._client.close() - def __enter__(self) -> "AzureStackManagementClient": + def __enter__(self) -> Self: self._client.__enter__() return self - def __exit__(self, *exc_details) -> None: + def __exit__(self, *exc_details: Any) -> None: self._client.__exit__(*exc_details) diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_configuration.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_configuration.py index eaa414a856b7..9259761df140 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_configuration.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_configuration.py @@ -6,26 +6,18 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING -from azure.core.configuration import Configuration from azure.core.pipeline import policies from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy from ._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class AzureStackManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class AzureStackManagementClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for AzureStackManagementClient. Note that all parameters used to create this instance are saved as instance @@ -42,8 +34,7 @@ class AzureStackManagementClientConfiguration(Configuration): # pylint: disable """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(AzureStackManagementClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", "2022-06-01") + api_version: str = kwargs.pop("api_version", "2022-06-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -55,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-azurestack/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: @@ -63,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None: self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: self.authentication_policy = ARMChallengeAuthenticationPolicy( diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/__init__.py new file mode 100644 index 000000000000..0af9b28f6607 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/__init__.py @@ -0,0 +1,6 @@ +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_serialization.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/serialization.py similarity index 77% rename from sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_serialization.py rename to sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/serialization.py index 2c170e28dbca..f5187701d7be 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_serialization.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_utils/serialization.py @@ -1,30 +1,12 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# coding=utf-8 # -------------------------------------------------------------------------- -# # Copyright (c) Microsoft Corporation. All rights reserved. -# -# The MIT License (MIT) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the ""Software""), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -# pylint: skip-file # pyright: reportUnnecessaryTypeIgnoreComment=false from base64 import b64decode, b64encode @@ -38,7 +20,19 @@ import re import sys import codecs -from typing import Optional, Union, AnyStr, IO, Mapping +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + MutableMapping, + List, +) try: from urllib import quote # type: ignore @@ -47,13 +41,15 @@ import xml.etree.ElementTree as ET import isodate # type: ignore +from typing_extensions import Self -from typing import Dict, Any, cast - -from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") +JSON = MutableMapping[str, Any] + class RawDeserializer: @@ -74,6 +70,8 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: :param data: Input, could be bytes or stream (will be decoded with UTF8) or text :type data: str or bytes or IO :param str content_type: The content type. + :return: The deserialized data. + :rtype: object """ if hasattr(data, "read"): # Assume a stream @@ -95,7 +93,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: try: return json.loads(data_as_str) except ValueError as err: - raise DeserializationError("JSON is invalid: {}".format(err), err) + raise DeserializationError("JSON is invalid: {}".format(err), err) from err elif "xml" in (content_type or []): try: @@ -107,7 +105,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: pass return ET.fromstring(data_as_str) # nosec - except ET.ParseError: + except ET.ParseError as err: # It might be because the server has an issue, and returned JSON with # content-type XML.... # So let's try a JSON load, and if it's still broken @@ -126,7 +124,9 @@ def _json_attemp(data): # The function hack is because Py2.7 messes up with exception # context otherwise. _LOGGER.critical("Wasn't XML not JSON, failing") - raise_with_traceback(DeserializationError, "XML is invalid") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) @classmethod @@ -136,6 +136,11 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], Use bytes and headers to NOT use any requests/aiohttp or whatever specific implementation. Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object """ # Try to use content-type from headers if available content_type = None @@ -153,13 +158,6 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None -try: - basestring # type: ignore - unicode_str = unicode # type: ignore -except NameError: - basestring = str - unicode_str = str - _LOGGER = logging.getLogger(__name__) try: @@ -167,80 +165,31 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], except NameError: _long_type = int - -class UTC(datetime.tzinfo): - """Time Zone info for handling UTC""" - - def utcoffset(self, dt): - """UTF offset for UTC is 0.""" - return datetime.timedelta(0) - - def tzname(self, dt): - """Timestamp representation.""" - return "Z" - - def dst(self, dt): - """No daylight saving for UTC.""" - return datetime.timedelta(hours=1) - - -try: - from datetime import timezone as _FixedOffset # type: ignore -except ImportError: # Python 2.7 - - class _FixedOffset(datetime.tzinfo): # type: ignore - """Fixed offset in minutes east from UTC. - Copy/pasted from Python doc - :param datetime.timedelta offset: offset in timedelta format - """ - - def __init__(self, offset): - self.__offset = offset - - def utcoffset(self, dt): - return self.__offset - - def tzname(self, dt): - return str(self.__offset.total_seconds() / 3600) - - def __repr__(self): - return "".format(self.tzname(None)) - - def dst(self, dt): - return datetime.timedelta(0) - - def __getinitargs__(self): - return (self.__offset,) - - -try: - from datetime import timezone - - TZ_UTC = timezone.utc -except ImportError: - TZ_UTC = UTC() # type: ignore +TZ_UTC = datetime.timezone.utc _FLATTEN = re.compile(r"(? None: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) elif k in self._validation and self._validation[k].get("readonly", False): @@ -287,25 +243,35 @@ def __init__(self, **kwargs): else: setattr(self, k, kwargs[k]) - def __eq__(self, other): - """Compare objects by comparing all attributes.""" + def __eq__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ if isinstance(other, self.__class__): return self.__dict__ == other.__dict__ return False - def __ne__(self, other): - """Compare objects by comparing all attributes.""" + def __ne__(self, other: Any) -> bool: + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ return not self.__eq__(other) - def __str__(self): + def __str__(self) -> str: return str(self.__dict__) @classmethod - def enable_additional_properties_sending(cls): + def enable_additional_properties_sending(cls) -> None: cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} @classmethod - def is_xml_model(cls): + def is_xml_model(cls) -> bool: try: cls._xml_map # type: ignore except AttributeError: @@ -314,7 +280,11 @@ def is_xml_model(cls): @classmethod def _create_xml_node(cls): - """Create XML node.""" + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ try: xml_map = cls._xml_map # type: ignore except AttributeError: @@ -322,8 +292,8 @@ def _create_xml_node(cls): return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) - def serialize(self, keep_readonly=False, **kwargs): - """Return the JSON that would be sent to azure from this model. + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: + """Return the JSON that would be sent to server from this model. This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. @@ -334,10 +304,17 @@ def serialize(self, keep_readonly=False, **kwargs): :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) - def as_dict(self, keep_readonly=True, key_transformer=attribute_transformer, **kwargs): - """Return a dict that can be JSONify using json.dump. + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. Advanced usage might optionally use a callback as parameter: @@ -363,12 +340,15 @@ def my_key_transformer(key, attr_desc, value): If you want XML serialization, you can pass the kwargs is_xml=True. + :param bool keep_readonly: If you want to serialize the readonly attributes :param function key_transformer: A key transformer function. :returns: A dict JSON compatible object :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) @classmethod def _infer_class_models(cls): @@ -378,25 +358,31 @@ def _infer_class_models(cls): client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} if cls.__name__ not in client_models: raise ValueError("Not Autorest generated code") - except Exception: + except Exception: # pylint: disable=broad-exception-caught # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. client_models = {cls.__name__: cls} return client_models @classmethod - def deserialize(cls, data, content_type=None): + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: """Parse a str using the RestAPI syntax and return a model. :param str data: A str using RestAPI structure. JSON by default. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model - :raises: DeserializationError if something went wrong + :raises DeserializationError: if something went wrong + :rtype: Self """ deserializer = Deserializer(cls._infer_class_models()) - return deserializer(cls.__name__, data, content_type=content_type) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore @classmethod - def from_dict(cls, data, key_extractors=None, content_type=None): + def from_dict( + cls, + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> Self: """Parse a dict using given key extractor return a model. By default consider key @@ -404,13 +390,15 @@ def from_dict(cls, data, key_extractors=None, content_type=None): and last_rest_key_case_insensitive_extractor) :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model - :raises: DeserializationError if something went wrong + :raises DeserializationError: if something went wrong + :rtype: Self """ deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( - [ + deserializer.key_extractors = ( # type: ignore + [ # type: ignore attribute_key_case_insensitive_extractor, rest_key_case_insensitive_extractor, last_rest_key_case_insensitive_extractor, @@ -418,7 +406,7 @@ def from_dict(cls, data, key_extractors=None, content_type=None): if key_extractors is None else key_extractors ) - return deserializer(cls.__name__, data, content_type=content_type) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore @classmethod def _flatten_subtype(cls, key, objects): @@ -426,21 +414,25 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access return result @classmethod def _classify(cls, response, objects): """Check the class _subtype_map for any child classes. We want to ignore any inherited _subtype_maps. - Remove the polymorphic key from the initial data. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class """ for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): subtype_value = None if not isinstance(response, ET.Element): rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None) + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) else: subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) if subtype_value: @@ -479,11 +471,13 @@ def _decode_attribute_map_key(key): inside the received data. :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str """ return key.replace("\\.", ".") -class Serializer(object): +class Serializer: # pylint: disable=too-many-public-methods """Request object model serializer.""" basic_types = {str: "str", int: "int", bool: "bool", float: "float"} @@ -518,7 +512,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -534,17 +528,20 @@ def __init__(self, classes=None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True - def _serialize(self, target_obj, data_type=None, **kwargs): + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): """Serialize data into a string according to type. - :param target_obj: The data to be serialized. + :param object target_obj: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str, dict - :raises: SerializationError if serialization fails. + :raises SerializationError: if serialization fails. + :returns: The serialized data. """ key_transformer = kwargs.get("key_transformer", self.key_transformer) keep_readonly = kwargs.get("keep_readonly", False) @@ -570,12 +567,14 @@ def _serialize(self, target_obj, data_type=None, **kwargs): serialized = {} if is_xml_model_serialization: - serialized = target_obj._create_xml_node() + serialized = target_obj._create_xml_node() # pylint: disable=protected-access try: - attributes = target_obj._attribute_map + attributes = target_obj._attribute_map # pylint: disable=protected-access for attr, attr_desc in attributes.items(): attr_name = attr - if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False): + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): continue if attr_name == "additional_properties" and attr_desc["key"] == "": @@ -602,7 +601,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -611,7 +610,8 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if isinstance(new_attr, list): serialized.extend(new_attr) # type: ignore elif isinstance(new_attr, ET.Element): - # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces. + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. if "name" not in getattr(orig_attr, "_xml_map", {}): splitted_tag = new_attr.tag.split("}") if len(splitted_tag) == 2: # Namespace @@ -622,12 +622,11 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = unicode_str(new_attr) + local_node.text = str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore - unflattened = {k: new_attr} - new_attr = unflattened + new_attr = {k: new_attr} _new_attr = new_attr _serialized = serialized @@ -636,28 +635,29 @@ def _serialize(self, target_obj, data_type=None, **kwargs): _serialized.update(_new_attr) # type: ignore _new_attr = _new_attr[k] # type: ignore _serialized = _serialized[k] - except ValueError: - continue + except ValueError as err: + if isinstance(err, SerializationError): + raise except (AttributeError, KeyError, TypeError) as err: msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) - raise_with_traceback(SerializationError, msg, err) - else: - return serialized + raise SerializationError(msg) from err + return serialized def body(self, data, data_type, **kwargs): """Serialize data intended for a request body. - :param data: The data to be serialized. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: dict - :raises: SerializationError if serialization fails. - :raises: ValueError if data is None + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body """ # Just in case this is a dict - internal_data_type = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type, None) + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) try: is_xml_model_serialization = kwargs["is_xml"] except KeyError: @@ -681,20 +681,22 @@ def body(self, data, data_type, **kwargs): attribute_key_case_insensitive_extractor, last_rest_key_case_insensitive_extractor, ] - data = deserializer._deserialize(data_type, data) + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access except DeserializationError as err: - raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err) + raise SerializationError("Unable to build a model: " + str(err)) from err return self._serialize(data, data_type, **kwargs) def url(self, name, data, data_type, **kwargs): """Serialize data intended for a URL path. - :param data: The data to be serialized. + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None """ try: output = self.serialize_data(data, data_type, **kwargs) @@ -703,30 +705,30 @@ def url(self, name, data, data_type, **kwargs): if kwargs.get("skip_quote") is True: output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) else: output = quote(str(output), safe="") - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return output + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output def query(self, name, data, data_type, **kwargs): """Serialize data intended for a URL query. - :param data: The data to be serialized. + :param str name: The name of the query parameter. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. - :rtype: str - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :rtype: str, list + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized query parameter """ try: # Treat the list aside, since we don't want to encode the div separator if data_type.startswith("["): internal_data_type = data_type[1:-1] - data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data] - if not kwargs.get("skip_quote", False): - data = [quote(str(d), safe="") for d in data] - return str(self.serialize_iter(data, internal_data_type, **kwargs)) + do_quote = not kwargs.get("skip_quote", False) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) # Not a list, regular serialization output = self.serialize_data(data, data_type, **kwargs) @@ -736,19 +738,20 @@ def query(self, name, data, data_type, **kwargs): output = str(output) else: output = quote(str(output), safe="") - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return str(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) def header(self, name, data, data_type, **kwargs): """Serialize data intended for a request header. - :param data: The data to be serialized. + :param str name: The name of the header. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header """ try: if data_type in ["[str]"]: @@ -757,30 +760,31 @@ def header(self, name, data, data_type, **kwargs): output = self.serialize_data(data, data_type, **kwargs) if data_type == "bool": output = json.dumps(output) - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return str(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) def serialize_data(self, data, data_type, **kwargs): """Serialize generic data according to supplied data type. - :param data: The data to be serialized. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. - :param bool required: Whether it's essential that the data not be - empty or None - :raises: AttributeError if required data is None. - :raises: ValueError if data is None - :raises: SerializationError if serialization fails. + :raises AttributeError: if required data is None. + :raises ValueError: if data is None + :raises SerializationError: if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list """ if data is None: raise ValueError("No value for given attribute") try: + if data is CoreNull: + return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) - elif data_type in self.serialize_type: + if data_type in self.serialize_type: return self.serialize_type[data_type](data, **kwargs) # If dependencies is empty, try with current data class @@ -795,12 +799,11 @@ def serialize_data(self, data, data_type, **kwargs): except (ValueError, TypeError) as err: msg = "Unable to serialize value: {!r} as type: {!r}." - raise_with_traceback(SerializationError, msg.format(data, data_type), err) - else: - return self._serialize(data, **kwargs) + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) @classmethod - def _get_custom_serializers(cls, data_type, **kwargs): + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) if custom_serializer: return custom_serializer @@ -816,23 +819,26 @@ def serialize_basic(cls, data, data_type, **kwargs): - basic_types_serializers dict[str, callable] : If set, use the callable as serializer - is_xml bool : If set, use xml_basic_types_serializers - :param data: Object to be serialized. + :param obj data: Object to be serialized. :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object """ custom_serializer = cls._get_custom_serializers(data_type, **kwargs) if custom_serializer: return custom_serializer(data) if data_type == "str": return cls.serialize_unicode(data) - return eval(data_type)(data) # nosec + return eval(data_type)(data) # nosec # pylint: disable=eval-used @classmethod def serialize_unicode(cls, data): """Special handling for serializing unicode strings in Py2. Encode to UTF-8 if unicode, otherwise handle as a str. - :param data: Object to be serialized. + :param str data: Object to be serialized. :rtype: str + :return: serialized object """ try: # If I received an enum, return its value return data.value @@ -846,8 +852,7 @@ def serialize_unicode(cls, data): return data except NameError: return str(data) - else: - return str(data) + return str(data) def serialize_iter(self, data, iter_type, div=None, **kwargs): """Serialize iterable. @@ -857,13 +862,13 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs): serialization_ctxt['type'] should be same as data_type. - is_xml bool : If set, serialize as XML - :param list attr: Object to be serialized. + :param list data: Object to be serialized. :param str iter_type: Type of object in the iterable. - :param bool required: Whether the objects in the iterable must - not be None or empty. :param str div: If set, this str will be used to combine the elements in the iterable into a combined string. Default is 'None'. + Defaults to False. :rtype: list, str + :return: serialized iterable """ if isinstance(data, str): raise SerializationError("Refuse str type as a valid iter type.") @@ -875,9 +880,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs): for d in data: try: serialized.append(self.serialize_data(d, iter_type, **kwargs)) - except ValueError: + except ValueError as err: + if isinstance(err, SerializationError): + raise serialized.append(None) + if kwargs.get("do_quote", False): + serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] + if div: serialized = ["" if s is None else str(s) for s in serialized] serialized = div.join(serialized) @@ -913,16 +923,17 @@ def serialize_dict(self, attr, dict_type, **kwargs): :param dict attr: Object to be serialized. :param str dict_type: Type of object in the dictionary. - :param bool required: Whether the objects in the dictionary must - not be None or empty. :rtype: dict + :return: serialized dictionary """ serialization_ctxt = kwargs.get("serialization_ctxt", {}) serialized = {} for key, value in attr.items(): try: serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) - except ValueError: + except ValueError as err: + if isinstance(err, SerializationError): + raise serialized[self.serialize_unicode(key)] = None if "xml" in serialization_ctxt: @@ -937,7 +948,7 @@ def serialize_dict(self, attr, dict_type, **kwargs): return serialized - def serialize_object(self, attr, **kwargs): + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements """Serialize a generic object. This will be handled as a dictionary. If object passed in is not a basic type (str, int, float, dict, list) it will simply be @@ -945,6 +956,7 @@ def serialize_object(self, attr, **kwargs): :param dict attr: Object to be serialized. :rtype: dict or str + :return: serialized object """ if attr is None: return None @@ -955,7 +967,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is unicode_str: + if obj_type is str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -969,7 +981,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_decimal(attr) # If it's a model or I know this dependency, serialize as a Model - elif obj_type in self.dependencies.values() or isinstance(attr, Model): + if obj_type in self.dependencies.values() or isinstance(attr, Model): return self._serialize(attr) if obj_type == dict: @@ -1000,56 +1012,61 @@ def serialize_enum(attr, enum_obj=None): try: enum_obj(result) # type: ignore return result - except ValueError: + except ValueError as exc: for enum_value in enum_obj: # type: ignore if enum_value.value.lower() == str(attr).lower(): return enum_value.value error = "{!r} is not valid value for enum {!r}" - raise SerializationError(error.format(attr, enum_obj)) + raise SerializationError(error.format(attr, enum_obj)) from exc @staticmethod - def serialize_bytearray(attr, **kwargs): + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument """Serialize bytearray into base-64 string. - :param attr: Object to be serialized. + :param str attr: Object to be serialized. :rtype: str + :return: serialized base64 """ return b64encode(attr).decode() @staticmethod - def serialize_base64(attr, **kwargs): + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument """Serialize str into base-64 string. - :param attr: Object to be serialized. + :param str attr: Object to be serialized. :rtype: str + :return: serialized base64 """ encoded = b64encode(attr).decode("ascii") return encoded.strip("=").replace("+", "-").replace("/", "_") @staticmethod - def serialize_decimal(attr, **kwargs): + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument """Serialize Decimal object to float. - :param attr: Object to be serialized. + :param decimal attr: Object to be serialized. :rtype: float + :return: serialized decimal """ return float(attr) @staticmethod - def serialize_long(attr, **kwargs): + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument """Serialize long (Py2) or int (Py3). - :param attr: Object to be serialized. + :param int attr: Object to be serialized. :rtype: int/long + :return: serialized long """ return _long_type(attr) @staticmethod - def serialize_date(attr, **kwargs): + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument """Serialize Date object into ISO-8601 formatted string. :param Date attr: Object to be serialized. :rtype: str + :return: serialized date """ if isinstance(attr, str): attr = isodate.parse_date(attr) @@ -1057,11 +1074,12 @@ def serialize_date(attr, **kwargs): return t @staticmethod - def serialize_time(attr, **kwargs): + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument """Serialize Time object into ISO-8601 formatted string. :param datetime.time attr: Object to be serialized. :rtype: str + :return: serialized time """ if isinstance(attr, str): attr = isodate.parse_time(attr) @@ -1071,30 +1089,32 @@ def serialize_time(attr, **kwargs): return t @staticmethod - def serialize_duration(attr, **kwargs): + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument """Serialize TimeDelta object into ISO-8601 formatted string. :param TimeDelta attr: Object to be serialized. :rtype: str + :return: serialized duration """ if isinstance(attr, str): attr = isodate.parse_duration(attr) return isodate.duration_isoformat(attr) @staticmethod - def serialize_rfc(attr, **kwargs): + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into RFC-1123 formatted string. :param Datetime attr: Object to be serialized. :rtype: str - :raises: TypeError if format invalid. + :raises TypeError: if format invalid. + :return: serialized rfc """ try: if not attr.tzinfo: _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") utc = attr.utctimetuple() - except AttributeError: - raise TypeError("RFC1123 object must be valid Datetime object.") + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( Serializer.days[utc.tm_wday], @@ -1107,12 +1127,13 @@ def serialize_rfc(attr, **kwargs): ) @staticmethod - def serialize_iso(attr, **kwargs): + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into ISO-8601 formatted string. :param Datetime attr: Object to be serialized. :rtype: str - :raises: SerializationError if format invalid. + :raises SerializationError: if format invalid. + :return: serialized iso """ if isinstance(attr, str): attr = isodate.parse_datetime(attr) @@ -1132,19 +1153,20 @@ def serialize_iso(attr, **kwargs): return date + microseconds + "Z" except (ValueError, OverflowError) as err: msg = "Unable to serialize datetime object." - raise_with_traceback(SerializationError, msg, err) + raise SerializationError(msg) from err except AttributeError as err: msg = "ISO-8601 object must be valid Datetime object." - raise_with_traceback(TypeError, msg, err) + raise TypeError(msg) from err @staticmethod - def serialize_unix(attr, **kwargs): + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into IntTime format. This is represented as seconds. :param Datetime attr: Object to be serialized. :rtype: int - :raises: SerializationError if format invalid + :raises SerializationError: if format invalid + :return: serialied unix """ if isinstance(attr, int): return attr @@ -1152,16 +1174,17 @@ def serialize_unix(attr, **kwargs): if not attr.tzinfo: _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") return int(calendar.timegm(attr.utctimetuple())) - except AttributeError: - raise TypeError("Unix time object must be valid Datetime object.") + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc -def rest_key_extractor(attr, attr_desc, data): +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument key = attr_desc["key"] working_data = data while "." in key: - dict_keys = _FLATTEN.split(key) + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1170,14 +1193,15 @@ def rest_key_extractor(attr, attr_desc, data): if working_data is None: # If at any point while following flatten JSON path see None, it means # that all properties under are None as well - # https://github.com/Azure/msrest-for-python/issues/197 return None key = ".".join(dict_keys[1:]) return working_data.get(key) -def rest_key_case_insensitive_extractor(attr, attr_desc, data): +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): key = attr_desc["key"] working_data = data @@ -1191,7 +1215,6 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data): if working_data is None: # If at any point while following flatten JSON path see None, it means # that all properties under are None as well - # https://github.com/Azure/msrest-for-python/issues/197 return None key = ".".join(dict_keys[1:]) @@ -1199,17 +1222,29 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data): return attribute_key_case_insensitive_extractor(key, None, working_data) -def last_rest_key_extractor(attr, attr_desc, data): - """Extract the attribute in "data" based on the last part of the JSON path key.""" +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ key = attr_desc["key"] dict_keys = _FLATTEN.split(key) return attribute_key_extractor(dict_keys[-1], None, data) -def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument """Extract the attribute in "data" based on the last part of the JSON path key. This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute """ key = attr_desc["key"] dict_keys = _FLATTEN.split(key) @@ -1242,11 +1277,11 @@ def _extract_name_from_internal_type(internal_type): xml_name = internal_type_xml_map.get("name", internal_type.__name__) xml_ns = internal_type_xml_map.get("ns", None) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) return xml_name -def xml_key_extractor(attr, attr_desc, data): +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements if isinstance(data, dict): return None @@ -1266,7 +1301,7 @@ def xml_key_extractor(attr, attr_desc, data): # Integrate namespace if necessary xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) # If it's an attribute, that's simple if xml_desc.get("attr", False): @@ -1298,22 +1333,21 @@ def xml_key_extractor(attr, attr_desc, data): if is_iter_type: if is_wrapped: return None # is_wrapped no node, we want None - else: - return [] # not wrapped, assume empty list + return [] # not wrapped, assume empty list return None # Assume it's not there, maybe an optional node. # If is_iter_type and not wrapped, return all found children if is_iter_type: if not is_wrapped: return children - else: # Iter and wrapped, should have found one node only (the wrap one) - if len(children) != 1: - raise DeserializationError( - "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( - xml_name - ) + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name ) - return list(children[0]) # Might be empty list and that's ok. + ) + return list(children[0]) # Might be empty list and that's ok. # Here it's not a itertype, we should have found one element only or empty if len(children) > 1: @@ -1321,7 +1355,7 @@ def xml_key_extractor(attr, attr_desc, data): return children[0] -class Deserializer(object): +class Deserializer: """Response object model deserializer. :param dict classes: Class type dictionary for deserializing complex types. @@ -1330,9 +1364,9 @@ class Deserializer(object): basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1352,7 +1386,7 @@ def __init__(self, classes=None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1368,27 +1402,29 @@ def __call__(self, target_obj, response_data, content_type=None): :param str target_obj: Target data type to deserialize to. :param requests.Response response_data: REST response object. :param str content_type: Swagger "produces" if available. - :raises: DeserializationError if deserialization fails. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. + :rtype: object """ data = self._unpack_content(response_data, content_type) return self._deserialize(target_obj, data) - def _deserialize(self, target_obj, data): + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements """Call the deserializer on a model. Data needs to be already deserialized as JSON or XML ElementTree :param str target_obj: Target data type to deserialize to. :param object data: Object to deserialize. - :raises: DeserializationError if deserialization fails. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. + :rtype: object """ # This is already a model, go recursive just in case if hasattr(data, "_attribute_map"): constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] try: - for attr, mapconfig in data._attribute_map.items(): + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access if attr in constants: continue value = getattr(data, attr) @@ -1405,15 +1441,15 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, basestring): + if isinstance(response, str): return self.deserialize_data(data, response) - elif isinstance(response, type) and issubclass(response, Enum): + if isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) - if data is None: + if data is None or data is CoreNull: return data try: - attributes = response._attribute_map # type: ignore + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access d_attrs = {} for attr, attr_desc in attributes.items(): # Check empty string. If it's not empty, someone has a real "additionalProperties"... @@ -1442,10 +1478,9 @@ def _deserialize(self, target_obj, data): d_attrs[attr] = value except (AttributeError, TypeError, KeyError) as err: msg = "Unable to deserialize to object: " + class_name # type: ignore - raise_with_traceback(DeserializationError, msg, err) - else: - additional_properties = self._build_additional_properties(attributes, data) - return self._instantiate_model(response, d_attrs, additional_properties) + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) def _build_additional_properties(self, attribute_map, data): if not self.additional_properties_detection: @@ -1471,22 +1506,24 @@ def _classify_target(self, target, data): Once classification has been determined, initialize object. :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple """ if target is None: return None, None - if isinstance(target, basestring): + if isinstance(target, str): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access except AttributeError: pass # Target is not a Model, no classify - return target, target.__class__.__name__ + return target, target.__class__.__name__ # type: ignore def failsafe_deserialize(self, target_obj, data, content_type=None): """Ignores any errors encountered in deserialization, @@ -1496,12 +1533,14 @@ def failsafe_deserialize(self, target_obj, data, content_type=None): a deserialization error. :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object """ try: return self(target_obj, data, content_type=content_type) - except: + except: # pylint: disable=bare-except _LOGGER.debug( "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True ) @@ -1519,10 +1558,12 @@ def _unpack_content(raw_data, content_type=None): If raw_data is something else, bypass all logic and return it directly. - :param raw_data: Data to be processed. - :param content_type: How to parse if raw_data is a string/bytes. + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. :raises JSONDecodeError: If JSON is requested and parsing is impossible. :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. """ # Assume this is enough to detect a Pipeline Response without importing it context = getattr(raw_data, "context", {}) @@ -1539,31 +1580,42 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data def _instantiate_model(self, response, attrs, additional_properties=None): """Instantiate a response model passing in deserialized args. - :param response: The response model class. - :param d_attrs: The deserialized response attributes. + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. """ if callable(response): subtype = getattr(response, "_subtype_map", {}) try: - readonly = [k for k, v in response._validation.items() if v.get("readonly")] - const = [k for k, v in response._validation.items() if v.get("constant")] + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} response_obj = response(**kwargs) for attr in readonly: setattr(response_obj, attr, attrs.get(attr)) if additional_properties: - response_obj.additional_properties = additional_properties + response_obj.additional_properties = additional_properties # type: ignore return response_obj except TypeError as err: msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore - raise DeserializationError(msg + str(err)) + raise DeserializationError(msg + str(err)) from err else: try: for attr, value in attrs.items(): @@ -1572,15 +1624,16 @@ def _instantiate_model(self, response, attrs, additional_properties=None): except Exception as exp: msg = "Unable to populate response model. " msg += "Type: {}, Error: {}".format(type(response), exp) - raise DeserializationError(msg) + raise DeserializationError(msg) from exp - def deserialize_data(self, data, data_type): + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements """Process data for deserialization according to data type. :param str data: The response string to be deserialized. :param str data_type: The type to deserialize to. - :raises: DeserializationError if deserialization fails. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. + :rtype: object """ if data is None: return data @@ -1594,7 +1647,11 @@ def deserialize_data(self, data, data_type): if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): return data - is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"] + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: return None data_val = self.deserialize_type[data_type](data) @@ -1613,15 +1670,15 @@ def deserialize_data(self, data, data_type): except (ValueError, TypeError, AttributeError) as err: msg = "Unable to deserialize response data." msg += " Data: {}, {}".format(data, data_type) - raise_with_traceback(DeserializationError, msg, err) - else: - return self._deserialize(obj_type, data) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) def deserialize_iter(self, attr, iter_type): """Deserialize an iterable. :param list attr: Iterable to be deserialized. :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. :rtype: list """ if attr is None: @@ -1638,6 +1695,7 @@ def deserialize_dict(self, attr, dict_type): :param dict/list attr: Dictionary to be deserialized. Also accepts a list of key, value pairs. :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. :rtype: dict """ if isinstance(attr, list): @@ -1648,20 +1706,21 @@ def deserialize_dict(self, attr, dict_type): attr = {el.tag: el.text for el in attr} return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} - def deserialize_object(self, attr, **kwargs): + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements """Deserialize a generic object. This will be handled as a dictionary. :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. :rtype: dict - :raises: TypeError if non-builtin datatype encountered. + :raises TypeError: if non-builtin datatype encountered. """ if attr is None: return None if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, basestring): + if isinstance(attr, str): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1687,11 +1746,10 @@ def deserialize_object(self, attr, **kwargs): pass return deserialized - else: - error = "Cannot deserialize generic object with type: " - raise TypeError(error + str(obj_type)) + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) - def deserialize_basic(self, attr, data_type): + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements """Deserialize basic builtin data type from string. Will attempt to convert to str, int, float and bool. This function will also accept '1', '0', 'true' and 'false' as @@ -1699,8 +1757,9 @@ def deserialize_basic(self, attr, data_type): :param str attr: response string to be deserialized. :param str data_type: deserialization data type. + :return: Deserialized basic type. :rtype: str, int, float or bool - :raises: TypeError if string format is not valid. + :raises TypeError: if string format is not valid. """ # If we're here, data is supposed to be a basic type. # If it's still an XML node, take the text @@ -1710,24 +1769,23 @@ def deserialize_basic(self, attr, data_type): if data_type == "str": # None or '', node is empty string. return "" - else: - # None or '', node with a strong type is None. - # Don't try to model "empty bool" or "empty int" - return None + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, basestring): + if isinstance(attr, str): if attr.lower() in ["true", "1"]: return True - elif attr.lower() in ["false", "0"]: + if attr.lower() in ["false", "0"]: return False raise TypeError("Invalid boolean value: {}".format(attr)) if data_type == "str": return self.deserialize_unicode(attr) - return eval(data_type)(attr) # nosec + return eval(data_type)(attr) # nosec # pylint: disable=eval-used @staticmethod def deserialize_unicode(data): @@ -1735,6 +1793,7 @@ def deserialize_unicode(data): as a string. :param str data: response string to be deserialized. + :return: Deserialized string. :rtype: str or unicode """ # We might be here because we have an enum modeled as string, @@ -1748,8 +1807,7 @@ def deserialize_unicode(data): return data except NameError: return str(data) - else: - return str(data) + return str(data) @staticmethod def deserialize_enum(data, enum_obj): @@ -1761,6 +1819,7 @@ def deserialize_enum(data, enum_obj): :param str data: Response string to be deserialized. If this value is None or invalid it will be returned as-is. :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. :rtype: Enum """ if isinstance(data, enum_obj) or data is None: @@ -1769,12 +1828,11 @@ def deserialize_enum(data, enum_obj): data = data.value if isinstance(data, int): # Workaround. We might consider remove it in the future. - # https://github.com/Azure/azure-rest-api-specs/issues/141 try: return list(enum_obj.__members__.values())[data] - except IndexError: + except IndexError as exc: error = "{!r} is not a valid index for enum {!r}" - raise DeserializationError(error.format(data, enum_obj)) + raise DeserializationError(error.format(data, enum_obj)) from exc try: return enum_obj(str(data)) except ValueError: @@ -1790,8 +1848,9 @@ def deserialize_bytearray(attr): """Deserialize string into bytearray. :param str attr: response string to be deserialized. + :return: Deserialized bytearray :rtype: bytearray - :raises: TypeError if string format invalid. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1802,8 +1861,9 @@ def deserialize_base64(attr): """Deserialize base64 encoded string into string. :param str attr: response string to be deserialized. + :return: Deserialized base64 string :rtype: bytearray - :raises: TypeError if string format invalid. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1817,24 +1877,26 @@ def deserialize_decimal(attr): """Deserialize string into Decimal object. :param str attr: response string to be deserialized. - :rtype: Decimal - :raises: DeserializationError if string format invalid. + :return: Deserialized decimal + :raises DeserializationError: if string format invalid. + :rtype: decimal """ if isinstance(attr, ET.Element): attr = attr.text try: - return decimal.Decimal(attr) # type: ignore + return decimal.Decimal(str(attr)) # type: ignore except decimal.DecimalException as err: msg = "Invalid decimal {}".format(attr) - raise_with_traceback(DeserializationError, msg, err) + raise DeserializationError(msg) from err @staticmethod def deserialize_long(attr): """Deserialize string into long (Py2) or int (Py3). :param str attr: response string to be deserialized. + :return: Deserialized int :rtype: long or int - :raises: ValueError if string format invalid. + :raises ValueError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1845,8 +1907,9 @@ def deserialize_duration(attr): """Deserialize ISO-8601 formatted string into TimeDelta object. :param str attr: response string to be deserialized. + :return: Deserialized duration :rtype: TimeDelta - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1854,32 +1917,33 @@ def deserialize_duration(attr): duration = isodate.parse_duration(attr) except (ValueError, OverflowError, AttributeError) as err: msg = "Cannot deserialize duration object." - raise_with_traceback(DeserializationError, msg, err) - else: - return duration + raise DeserializationError(msg) from err + return duration @staticmethod def deserialize_date(attr): """Deserialize ISO-8601 formatted string into Date object. :param str attr: response string to be deserialized. + :return: Deserialized date :rtype: Date - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore raise DeserializationError("Date must have only digits and -. Received: %s" % attr) # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - return isodate.parse_date(attr, defaultmonth=None, defaultday=None) + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) @staticmethod def deserialize_time(attr): """Deserialize ISO-8601 formatted string into time object. :param str attr: response string to be deserialized. + :return: Deserialized time :rtype: datetime.time - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1892,31 +1956,32 @@ def deserialize_rfc(attr): """Deserialize RFC-1123 formatted string into Datetime object. :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime :rtype: Datetime - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text try: parsed_date = email.utils.parsedate_tz(attr) # type: ignore date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) ) if not date_obj.tzinfo: date_obj = date_obj.astimezone(tz=TZ_UTC) except ValueError as err: msg = "Cannot deserialize to rfc datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj @staticmethod def deserialize_iso(attr): """Deserialize ISO-8601 formatted string into Datetime object. :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime :rtype: Datetime - :raises: DeserializationError if string format invalid. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1943,9 +2008,8 @@ def deserialize_iso(attr): raise OverflowError("Hit max or min date") except (ValueError, OverflowError, AttributeError) as err: msg = "Cannot deserialize datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj @staticmethod def deserialize_unix(attr): @@ -1953,15 +2017,16 @@ def deserialize_unix(attr): This is represented as seconds. :param int attr: Object to be serialized. + :return: Deserialized datetime :rtype: Datetime - :raises: DeserializationError if format invalid + :raises DeserializationError: if format invalid """ if isinstance(attr, ET.Element): attr = int(attr.text) # type: ignore try: + attr = int(attr) date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) except ValueError as err: msg = "Cannot deserialize to unix datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_vendor.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_vendor.py deleted file mode 100644 index 9aad73fc743e..000000000000 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_vendor.py +++ /dev/null @@ -1,27 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from azure.core.pipeline.transport import HttpRequest - - -def _convert_request(request, files=None): - data = request.content if not files else None - request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data) - if files: - request.set_formdata_body(files) - return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - formatted_components = template.split("/") - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_version.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_version.py index e32dc6ec4218..48944bf3938a 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_version.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0b1" +VERSION = "2.0.0" diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/__init__.py index 03f1c256c1b1..ef8aaff8800d 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/__init__.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/__init__.py @@ -5,12 +5,18 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._azure_stack_management_client import AzureStackManagementClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._azure_stack_management_client import AzureStackManagementClient # type: ignore try: from ._patch import __all__ as _patch_all - from ._patch import * # pylint: disable=unused-wildcard-import + from ._patch import * except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk @@ -18,6 +24,6 @@ __all__ = [ "AzureStackManagementClient", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_azure_stack_management_client.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_azure_stack_management_client.py index ea2fd3f06106..08cc4eb466cc 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_azure_stack_management_client.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_azure_stack_management_client.py @@ -7,13 +7,18 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, TYPE_CHECKING +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.settings import settings from azure.mgmt.core import AsyncARMPipelineClient +from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints from .. import models as _models -from .._serialization import Deserializer, Serializer +from .._utils.serialization import Deserializer, Serializer from ._configuration import AzureStackManagementClientConfiguration from .operations import ( CloudManifestFileOperations, @@ -25,11 +30,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class AzureStackManagementClient: # pylint: disable=client-accepts-api-version-keyword +class AzureStackManagementClient: """Azure Stack. :ivar operations: Operations operations @@ -50,7 +54,7 @@ class AzureStackManagementClient: # pylint: disable=client-accepts-api-version- :param subscription_id: Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. Required. :type subscription_id: str - :param base_url: Service URL. Default value is "https://management.azure.com". + :param base_url: Service URL. Default value is None. :type base_url: str :keyword api_version: Api Version. Default value is "2022-06-01". Note that overriding this default value may result in unsupported behavior. @@ -58,16 +62,38 @@ class AzureStackManagementClient: # pylint: disable=client-accepts-api-version- """ def __init__( - self, - credential: "AsyncTokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "AsyncTokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = AzureStackManagementClientConfiguration( - credential=credential, subscription_id=subscription_id, **kwargs + credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs + ) + + _policies = kwargs.pop("policies", None) + if _policies is None: + _policies = [ + policies.RequestIdPolicy(**kwargs), + self._config.headers_policy, + self._config.user_agent_policy, + self._config.proxy_policy, + policies.ContentDecodePolicy(**kwargs), + AsyncARMAutoResourceProviderRegistrationPolicy(), + self._config.redirect_policy, + self._config.retry_policy, + self._config.authentication_policy, + self._config.custom_hook_policy, + self._config.logging_policy, + policies.DistributedTracingPolicy(**kwargs), + policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, + self._config.http_logging_policy, + ] + self._client: AsyncARMPipelineClient = AsyncARMPipelineClient( + base_url=cast(str, base_url), policies=_policies, **kwargs ) - self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) @@ -86,7 +112,9 @@ def __init__( self.products = ProductsOperations(self._client, self._config, self._serialize, self._deserialize) self.registrations = RegistrationsOperations(self._client, self._config, self._serialize, self._deserialize) - def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: + def _send_request( + self, request: HttpRequest, *, stream: bool = False, **kwargs: Any + ) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. >>> from azure.core.rest import HttpRequest @@ -106,14 +134,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncH request_copy = deepcopy(request) request_copy.url = self._client.format_url(request_copy.url) - return self._client.send_request(request_copy, **kwargs) + return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore async def close(self) -> None: await self._client.close() - async def __aenter__(self) -> "AzureStackManagementClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self - async def __aexit__(self, *exc_details) -> None: + async def __aexit__(self, *exc_details: Any) -> None: await self._client.__aexit__(*exc_details) diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_configuration.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_configuration.py index 0c123f29b987..229962443ebe 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_configuration.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/_configuration.py @@ -6,26 +6,18 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING -from azure.core.configuration import Configuration from azure.core.pipeline import policies from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy from .._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class AzureStackManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class AzureStackManagementClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for AzureStackManagementClient. Note that all parameters used to create this instance are saved as instance @@ -42,8 +34,7 @@ class AzureStackManagementClientConfiguration(Configuration): # pylint: disable """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(AzureStackManagementClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", "2022-06-01") + api_version: str = kwargs.pop("api_version", "2022-06-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -55,6 +46,7 @@ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **k self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-azurestack/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: @@ -63,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None: self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: self.authentication_policy = AsyncARMChallengeAuthenticationPolicy( diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/__init__.py index 61b0c93def0e..bdc04368c1e4 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/__init__.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/__init__.py @@ -5,16 +5,22 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._cloud_manifest_file_operations import CloudManifestFileOperations -from ._deployment_license_operations import DeploymentLicenseOperations -from ._customer_subscriptions_operations import CustomerSubscriptionsOperations -from ._products_operations import ProductsOperations -from ._registrations_operations import RegistrationsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._cloud_manifest_file_operations import CloudManifestFileOperations # type: ignore +from ._deployment_license_operations import DeploymentLicenseOperations # type: ignore +from ._customer_subscriptions_operations import CustomerSubscriptionsOperations # type: ignore +from ._products_operations import ProductsOperations # type: ignore +from ._registrations_operations import RegistrationsOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -25,5 +31,5 @@ "ProductsOperations", "RegistrationsOperations", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_cloud_manifest_file_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_cloud_manifest_file_operations.py index e6d4338b7bc2..e700582ae2d0 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_cloud_manifest_file_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_cloud_manifest_file_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,10 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Optional, TypeVar +from azure.core import AsyncPipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -18,20 +18,16 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._cloud_manifest_file_operations import build_get_request, build_list_request +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -50,21 +46,22 @@ class CloudManifestFileOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async async def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: """Returns a cloud specific manifest JSON file with latest version. - :keyword callable cls: A custom type or function that will be passed the direct response :return: CloudManifestFileResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CloudManifestFileResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -75,22 +72,19 @@ async def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CloudManifestFileResponse] = kwargs.pop("cls", None) - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -100,14 +94,12 @@ async def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response) + deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list.metadata = {"url": "/providers/Microsoft.AzureStack/cloudManifestFiles"} + return deserialized # type: ignore @distributed_trace_async async def get( @@ -120,12 +112,11 @@ async def get( :param version_creation_date: Signing verification key version creation date. Default value is None. :type version_creation_date: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CloudManifestFileResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CloudManifestFileResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -136,24 +127,21 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CloudManifestFileResponse] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( verification_version=verification_version, version_creation_date=version_creation_date, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -163,11 +151,9 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response) + deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = {"url": "/providers/Microsoft.AzureStack/cloudManifestFiles/{verificationVersion}"} + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_customer_subscriptions_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_customer_subscriptions_operations.py index 1e65c2a11c5b..43c56e1f5069 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_customer_subscriptions_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_customer_subscriptions_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -20,26 +21,22 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._customer_subscriptions_operations import ( build_create_request, build_delete_request, build_get_request, build_list_request, ) +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -58,10 +55,12 @@ class CustomerSubscriptionsOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( @@ -73,7 +72,6 @@ def list( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CustomerSubscription or the result of cls(response) :rtype: @@ -83,12 +81,10 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CustomerSubscriptionList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -99,17 +95,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -121,13 +115,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("CustomerSubscriptionList", pipeline_response) @@ -137,10 +130,11 @@ async def extract_data(pipeline_response): return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -153,10 +147,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions" - } - @distributed_trace_async async def get( self, resource_group: str, registration_name: str, customer_subscription_name: str, **kwargs: Any @@ -169,12 +159,11 @@ async def get( :type registration_name: str :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -185,26 +174,23 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CustomerSubscription] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -214,19 +200,15 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CustomerSubscription", pipeline_response) + deserialized = self._deserialize("CustomerSubscription", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return deserialized # type: ignore @distributed_trace_async - async def delete( # pylint: disable=inconsistent-return-statements + async def delete( self, resource_group: str, registration_name: str, customer_subscription_name: str, **kwargs: Any ) -> None: """Deletes a customer subscription under a registration. @@ -237,12 +219,11 @@ async def delete( # pylint: disable=inconsistent-return-statements :type registration_name: str :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -253,26 +234,23 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -283,11 +261,7 @@ async def delete( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload async def create( @@ -314,7 +288,6 @@ async def create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: @@ -326,7 +299,7 @@ async def create( resource_group: str, registration_name: str, customer_subscription_name: str, - customer_creation_parameters: IO, + customer_creation_parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -341,11 +314,10 @@ async def create( :type customer_subscription_name: str :param customer_creation_parameters: Parameters use to create a customer subscription. Required. - :type customer_creation_parameters: IO + :type customer_creation_parameters: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: @@ -357,7 +329,7 @@ async def create( resource_group: str, registration_name: str, customer_subscription_name: str, - customer_creation_parameters: Union[_models.CustomerSubscription, IO], + customer_creation_parameters: Union[_models.CustomerSubscription, IO[bytes]], **kwargs: Any ) -> _models.CustomerSubscription: """Creates a new customer subscription under a registration. @@ -369,17 +341,14 @@ async def create( :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str :param customer_creation_parameters: Parameters use to create a customer subscription. Is - either a model type or a IO type. Required. - :type customer_creation_parameters: ~azure.mgmt.azurestack.models.CustomerSubscription or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + either a CustomerSubscription type or a IO[bytes] type. Required. + :type customer_creation_parameters: ~azure.mgmt.azurestack.models.CustomerSubscription or + IO[bytes] :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -390,21 +359,19 @@ async def create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CustomerSubscription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(customer_creation_parameters, (IO, bytes)): + if isinstance(customer_creation_parameters, (IOBase, bytes)): _content = customer_creation_parameters else: _json = self._serialize.body(customer_creation_parameters, "CustomerSubscription") - request = build_create_request( + _request = build_create_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, @@ -413,15 +380,14 @@ async def create( content_type=content_type, json=_json, content=_content, - template_url=self.create.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -431,13 +397,9 @@ async def create( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CustomerSubscription", pipeline_response) + deserialized = self._deserialize("CustomerSubscription", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_deployment_license_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_deployment_license_operations.py index bbd1ee6e1a0b..c7aed4c2bab2 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_deployment_license_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_deployment_license_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from azure.core import AsyncPipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -18,20 +19,16 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._deployment_license_operations import build_create_request +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -50,10 +47,12 @@ class DeploymentLicenseOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @overload async def create( @@ -70,7 +69,6 @@ async def create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -78,16 +76,15 @@ async def create( @overload async def create( - self, deployment_license_request: IO, *, content_type: str = "application/json", **kwargs: Any + self, deployment_license_request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.DeploymentLicenseResponse: """Creates a license that can be used to deploy an Azure Stack device. :param deployment_license_request: Request body for creating a deployment license. Required. - :type deployment_license_request: IO + :type deployment_license_request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -95,22 +92,19 @@ async def create( @distributed_trace_async async def create( - self, deployment_license_request: Union[_models.DeploymentLicenseRequest, IO], **kwargs: Any + self, deployment_license_request: Union[_models.DeploymentLicenseRequest, IO[bytes]], **kwargs: Any ) -> _models.DeploymentLicenseResponse: """Creates a license that can be used to deploy an Azure Stack device. :param deployment_license_request: Request body for creating a deployment license. Is either a - model type or a IO type. Required. - :type deployment_license_request: ~azure.mgmt.azurestack.models.DeploymentLicenseRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + DeploymentLicenseRequest type or a IO[bytes] type. Required. + :type deployment_license_request: ~azure.mgmt.azurestack.models.DeploymentLicenseRequest or + IO[bytes] :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -121,35 +115,32 @@ async def create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.DeploymentLicenseResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(deployment_license_request, (IO, bytes)): + if isinstance(deployment_license_request, (IOBase, bytes)): _content = deployment_license_request else: _json = self._serialize.body(deployment_license_request, "DeploymentLicenseRequest") - request = build_create_request( + _request = build_create_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.create.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -159,13 +150,9 @@ async def create( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DeploymentLicenseResponse", pipeline_response) + deserialized = self._deserialize("DeploymentLicenseResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.AzureStack/generateDeploymentLicense" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_operations.py index 31c08b2fdeb8..a71958086c6d 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -20,20 +20,16 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._operations import build_list_request +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -52,16 +48,17 @@ class Operations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: """Returns the list of supported REST operations. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.azurestack.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -69,12 +66,10 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -85,14 +80,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -104,13 +97,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("OperationList", pipeline_response) @@ -120,10 +112,11 @@ async def extract_data(pipeline_response): return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -135,5 +128,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.AzureStack/operations"} diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_products_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_products_operations.py index 55db1d24bfe1..352f642894fa 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_products_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_products_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -20,15 +21,14 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._products_operations import ( build_get_product_request, build_get_products_request, @@ -38,11 +38,8 @@ build_list_request, build_upload_log_request, ) +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,10 +58,12 @@ class ProductsOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> AsyncIterable["_models.Product"]: @@ -74,7 +73,6 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> As :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Product or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.azurestack.models.Product] :raises ~azure.core.exceptions.HttpResponseError: @@ -82,12 +80,10 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> As _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -98,17 +94,15 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> As def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -120,13 +114,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("ProductList", pipeline_response) @@ -136,10 +129,11 @@ async def extract_data(pipeline_response): return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -152,10 +146,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products" - } - @distributed_trace_async async def get( self, resource_group: str, registration_name: str, product_name: str, **kwargs: Any @@ -168,12 +158,11 @@ async def get( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -184,26 +173,23 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Product] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -213,16 +199,12 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Product", pipeline_response) + deserialized = self._deserialize("Product", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}" - } + return deserialized # type: ignore @distributed_trace_async async def list_details( @@ -236,12 +218,11 @@ async def list_details( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExtendedProduct or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ExtendedProduct :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -252,26 +233,23 @@ async def list_details( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExtendedProduct] = kwargs.pop("cls", None) - request = build_list_details_request( + _request = build_list_details_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_details.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -281,16 +259,12 @@ async def list_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExtendedProduct", pipeline_response) + deserialized = self._deserialize("ExtendedProduct", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listDetails" - } + return deserialized # type: ignore @overload async def list_products( @@ -316,7 +290,6 @@ async def list_products( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -328,7 +301,7 @@ async def list_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -342,11 +315,10 @@ async def list_products( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -358,7 +330,7 @@ async def list_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductList: """Returns a list of products. @@ -369,18 +341,14 @@ async def list_products( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -391,16 +359,14 @@ async def list_products( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -408,7 +374,7 @@ async def list_products( else: _json = None - request = build_list_products_request( + _request = build_list_products_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -417,15 +383,14 @@ async def list_products( content_type=content_type, json=_json, content=_content, - template_url=self.list_products.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -435,16 +400,12 @@ async def list_products( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductList", pipeline_response) + deserialized = self._deserialize("ProductList", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list_products.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listProducts" - } + return deserialized # type: ignore @overload async def get_products( @@ -470,7 +431,6 @@ async def get_products( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -482,7 +442,7 @@ async def get_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -496,11 +456,10 @@ async def get_products( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -512,7 +471,7 @@ async def get_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductList: """Returns a list of products. @@ -523,18 +482,14 @@ async def get_products( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -545,16 +500,14 @@ async def get_products( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -562,7 +515,7 @@ async def get_products( else: _json = None - request = build_get_products_request( + _request = build_get_products_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -571,15 +524,14 @@ async def get_products( content_type=content_type, json=_json, content=_content, - template_url=self.get_products.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -589,16 +541,12 @@ async def get_products( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductList", pipeline_response) + deserialized = self._deserialize("ProductList", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_products.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProducts" - } + return deserialized # type: ignore @overload async def get_product( @@ -624,7 +572,6 @@ async def get_product( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: @@ -636,7 +583,7 @@ async def get_product( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -650,11 +597,10 @@ async def get_product( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: @@ -666,7 +612,7 @@ async def get_product( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.Product: """Returns the specified product. @@ -677,18 +623,14 @@ async def get_product( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -699,16 +641,14 @@ async def get_product( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Product] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -716,7 +656,7 @@ async def get_product( else: _json = None - request = build_get_product_request( + _request = build_get_product_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -725,15 +665,14 @@ async def get_product( content_type=content_type, json=_json, content=_content, - template_url=self.get_product.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -743,16 +682,12 @@ async def get_product( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Product", pipeline_response) + deserialized = self._deserialize("Product", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get_product.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProduct" - } + return deserialized # type: ignore @overload async def upload_log( @@ -778,7 +713,6 @@ async def upload_log( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: @@ -790,7 +724,7 @@ async def upload_log( resource_group: str, registration_name: str, product_name: str, - marketplace_product_log_update: Optional[IO] = None, + marketplace_product_log_update: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -804,11 +738,10 @@ async def upload_log( :param product_name: Name of the product. Required. :type product_name: str :param marketplace_product_log_update: Update details for product log. Default value is None. - :type marketplace_product_log_update: IO + :type marketplace_product_log_update: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: @@ -820,7 +753,7 @@ async def upload_log( resource_group: str, registration_name: str, product_name: str, - marketplace_product_log_update: Optional[Union[_models.MarketplaceProductLogUpdate, IO]] = None, + marketplace_product_log_update: Optional[Union[_models.MarketplaceProductLogUpdate, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductLog: """Returns the specified product. @@ -831,19 +764,15 @@ async def upload_log( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param marketplace_product_log_update: Update details for product log. Is either a model type - or a IO type. Default value is None. + :param marketplace_product_log_update: Update details for product log. Is either a + MarketplaceProductLogUpdate type or a IO[bytes] type. Default value is None. :type marketplace_product_log_update: ~azure.mgmt.azurestack.models.MarketplaceProductLogUpdate - or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + or IO[bytes] :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -854,16 +783,14 @@ async def upload_log( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductLog] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(marketplace_product_log_update, (IO, bytes)): + if isinstance(marketplace_product_log_update, (IOBase, bytes)): _content = marketplace_product_log_update else: if marketplace_product_log_update is not None: @@ -871,7 +798,7 @@ async def upload_log( else: _json = None - request = build_upload_log_request( + _request = build_upload_log_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -880,15 +807,14 @@ async def upload_log( content_type=content_type, json=_json, content=_content, - template_url=self.upload_log.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -898,13 +824,9 @@ async def upload_log( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductLog", pipeline_response) + deserialized = self._deserialize("ProductLog", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - upload_log.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/uploadProductLog" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_registrations_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_registrations_operations.py index 8da0082c4894..be8a3b966dcb 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_registrations_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/operations/_registrations_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -20,15 +21,14 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request +from ..._utils.serialization import Deserializer, Serializer from ...operations._registrations_operations import ( build_create_or_update_request, build_delete_request, @@ -39,11 +39,8 @@ build_list_request, build_update_request, ) +from .._configuration import AzureStackManagementClientConfiguration -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -62,10 +59,12 @@ class RegistrationsOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, resource_group: str, **kwargs: Any) -> AsyncIterable["_models.Registration"]: @@ -73,7 +72,6 @@ def list(self, resource_group: str, **kwargs: Any) -> AsyncIterable["_models.Reg :param resource_group: Name of the resource group. Required. :type resource_group: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Registration or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.azurestack.models.Registration] :raises ~azure.core.exceptions.HttpResponseError: @@ -81,12 +79,10 @@ def list(self, resource_group: str, **kwargs: Any) -> AsyncIterable["_models.Reg _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RegistrationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -97,16 +93,14 @@ def list(self, resource_group: str, **kwargs: Any) -> AsyncIterable["_models.Reg def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -118,13 +112,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("RegistrationList", pipeline_response) @@ -134,10 +127,11 @@ async def extract_data(pipeline_response): return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -150,15 +144,10 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations" - } - @distributed_trace def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Registration"]: """Returns a list of all registrations under current subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Registration or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.azurestack.models.Registration] :raises ~azure.core.exceptions.HttpResponseError: @@ -166,12 +155,10 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Registra _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RegistrationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -182,15 +169,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Registra def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -202,13 +187,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("RegistrationList", pipeline_response) @@ -218,10 +202,11 @@ async def extract_data(pipeline_response): return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -234,10 +219,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.AzureStack/registrations" - } - @distributed_trace_async async def get(self, resource_group: str, registration_name: str, **kwargs: Any) -> _models.Registration: """Returns the properties of an Azure Stack registration. @@ -246,12 +227,11 @@ async def get(self, resource_group: str, registration_name: str, **kwargs: Any) :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -262,25 +242,22 @@ async def get(self, resource_group: str, registration_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -290,33 +267,26 @@ async def get(self, resource_group: str, registration_name: str, **kwargs: Any) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return deserialized # type: ignore @distributed_trace_async - async def delete( # pylint: disable=inconsistent-return-statements - self, resource_group: str, registration_name: str, **kwargs: Any - ) -> None: + async def delete(self, resource_group: str, registration_name: str, **kwargs: Any) -> None: """Delete the requested Azure Stack registration. :param resource_group: Name of the resource group. Required. :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -327,25 +297,22 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -356,11 +323,7 @@ async def delete( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload async def create_or_update( @@ -383,7 +346,6 @@ async def create_or_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -394,7 +356,7 @@ async def create_or_update( self, resource_group: str, registration_name: str, - token: IO, + token: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -406,11 +368,10 @@ async def create_or_update( :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str :param token: Registration token. Required. - :type token: IO + :type token: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -421,7 +382,7 @@ async def create_or_update( self, resource_group: str, registration_name: str, - token: Union[_models.RegistrationParameter, IO], + token: Union[_models.RegistrationParameter, IO[bytes]], **kwargs: Any ) -> _models.Registration: """Create or update an Azure Stack registration. @@ -430,17 +391,14 @@ async def create_or_update( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :param token: Registration token. Is either a model type or a IO type. Required. - :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param token: Registration token. Is either a RegistrationParameter type or a IO[bytes] type. + Required. + :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO[bytes] :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -451,21 +409,19 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(token, (IO, bytes)): + if isinstance(token, (IOBase, bytes)): _content = token else: _json = self._serialize.body(token, "RegistrationParameter") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, @@ -473,15 +429,14 @@ async def create_or_update( content_type=content_type, json=_json, content=_content, - template_url=self.create_or_update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -491,21 +446,13 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("Registration", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } - @overload async def update( self, @@ -527,7 +474,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -538,7 +484,7 @@ async def update( self, resource_group: str, registration_name: str, - token: IO, + token: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -550,11 +496,10 @@ async def update( :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str :param token: Registration token. Required. - :type token: IO + :type token: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -565,7 +510,7 @@ async def update( self, resource_group: str, registration_name: str, - token: Union[_models.RegistrationParameter, IO], + token: Union[_models.RegistrationParameter, IO[bytes]], **kwargs: Any ) -> _models.Registration: """Patch an Azure Stack registration. @@ -574,17 +519,14 @@ async def update( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :param token: Registration token. Is either a model type or a IO type. Required. - :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param token: Registration token. Is either a RegistrationParameter type or a IO[bytes] type. + Required. + :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO[bytes] :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -595,21 +537,19 @@ async def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(token, (IO, bytes)): + if isinstance(token, (IOBase, bytes)): _content = token else: _json = self._serialize.body(token, "RegistrationParameter") - request = build_update_request( + _request = build_update_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, @@ -617,15 +557,14 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -635,16 +574,12 @@ async def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return deserialized # type: ignore @distributed_trace_async async def get_activation_key( @@ -656,12 +591,11 @@ async def get_activation_key( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ActivationKeyResult or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ActivationKeyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -672,25 +606,22 @@ async def get_activation_key( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ActivationKeyResult] = kwargs.pop("cls", None) - request = build_get_activation_key_request( + _request = build_get_activation_key_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_activation_key.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -700,33 +631,26 @@ async def get_activation_key( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ActivationKeyResult", pipeline_response) + deserialized = self._deserialize("ActivationKeyResult", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_activation_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/getactivationkey" - } + return deserialized # type: ignore @distributed_trace_async - async def enable_remote_management( # pylint: disable=inconsistent-return-statements - self, resource_group: str, registration_name: str, **kwargs: Any - ) -> None: + async def enable_remote_management(self, resource_group: str, registration_name: str, **kwargs: Any) -> None: """Enables remote management for device under the Azure Stack registration. :param resource_group: Name of the resource group. Required. :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -739,19 +663,18 @@ async def enable_remote_management( # pylint: disable=inconsistent-return-state cls: ClsType[None] = kwargs.pop("cls", None) - request = build_enable_remote_management_request( + _request = build_enable_remote_management_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, - template_url=self.enable_remote_management.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -762,8 +685,4 @@ async def enable_remote_management( # pylint: disable=inconsistent-return-state raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - enable_remote_management.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/enableRemoteManagement" - } + return cls(pipeline_response, None, {}) # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/__init__.py index bd72c32df5cd..79080fd8501e 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/__init__.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/__init__.py @@ -5,49 +5,60 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._models_py3 import ActivationKeyResult -from ._models_py3 import CloudManifestFileDeploymentData -from ._models_py3 import CloudManifestFileProperties -from ._models_py3 import CloudManifestFileResponse -from ._models_py3 import Compatibility -from ._models_py3 import CustomerSubscription -from ._models_py3 import CustomerSubscriptionList -from ._models_py3 import DataDiskImage -from ._models_py3 import DeploymentLicenseRequest -from ._models_py3 import DeploymentLicenseResponse -from ._models_py3 import DeviceConfiguration -from ._models_py3 import Display -from ._models_py3 import ErrorDetails -from ._models_py3 import ErrorResponse -from ._models_py3 import ExtendedProduct -from ._models_py3 import ExtendedProductProperties -from ._models_py3 import IconUris -from ._models_py3 import MarketplaceProductLogUpdate -from ._models_py3 import Operation -from ._models_py3 import OperationList -from ._models_py3 import OsDiskImage -from ._models_py3 import Product -from ._models_py3 import ProductLink -from ._models_py3 import ProductList -from ._models_py3 import ProductLog -from ._models_py3 import ProductProperties -from ._models_py3 import Registration -from ._models_py3 import RegistrationList -from ._models_py3 import RegistrationParameter -from ._models_py3 import Resource -from ._models_py3 import TrackedResource -from ._models_py3 import VirtualMachineExtensionProductProperties -from ._models_py3 import VirtualMachineProductProperties +from typing import TYPE_CHECKING -from ._azure_stack_management_client_enums import Category -from ._azure_stack_management_client_enums import CompatibilityIssue -from ._azure_stack_management_client_enums import ComputeRole -from ._azure_stack_management_client_enums import Location -from ._azure_stack_management_client_enums import OperatingSystem -from ._azure_stack_management_client_enums import ProvisioningState +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models_py3 import ( # type: ignore + ActivationKeyResult, + CloudManifestFileDeploymentData, + CloudManifestFileProperties, + CloudManifestFileResponse, + Compatibility, + CustomerSubscription, + CustomerSubscriptionList, + DataDiskImage, + DeploymentLicenseRequest, + DeploymentLicenseResponse, + DeviceConfiguration, + Display, + ErrorDetails, + ErrorResponse, + ExtendedProduct, + ExtendedProductProperties, + IconUris, + MarketplaceProductLogUpdate, + Operation, + OperationList, + OsDiskImage, + Product, + ProductLink, + ProductList, + ProductLog, + ProductProperties, + Registration, + RegistrationList, + RegistrationParameter, + Resource, + TrackedResource, + VirtualMachineExtensionProductProperties, + VirtualMachineProductProperties, +) + +from ._azure_stack_management_client_enums import ( # type: ignore + Category, + CompatibilityIssue, + ComputeRole, + Location, + OperatingSystem, + ProvisioningState, +) from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -91,5 +102,5 @@ "OperatingSystem", "ProvisioningState", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_azure_stack_management_client_enums.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_azure_stack_management_client_enums.py index e42f960c4c1a..38af96ba590f 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_azure_stack_management_client_enums.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_azure_stack_management_client_enums.py @@ -44,6 +44,7 @@ class Location(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Location of the resource.""" GLOBAL = "global" + GLOBAL_ENUM = "global" class OperatingSystem(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_models_py3.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_models_py3.py index f9a355fdd5a4..706f9ea6f4c6 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_models_py3.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/models/_models_py3.py @@ -1,5 +1,5 @@ -# coding=utf-8 # pylint: disable=too-many-lines +# coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. @@ -7,12 +7,11 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union -from .. import _serialization +from .._utils import serialization as _serialization if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models @@ -27,7 +26,7 @@ class ActivationKeyResult(_serialization.Model): "activation_key": {"key": "activationKey", "type": "str"}, } - def __init__(self, *, activation_key: Optional[str] = None, **kwargs): + def __init__(self, *, activation_key: Optional[str] = None, **kwargs: Any) -> None: """ :keyword activation_key: Azure Stack activation key. :paramtype activation_key: str @@ -63,8 +62,8 @@ def __init__( custom_cloud_verification_key: Optional[str] = None, custom_cloud_arm_endpoint: Optional[str] = None, external_dsms_endpoint: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword external_dsms_certificates: Dsms external certificates. :paramtype external_dsms_certificates: str @@ -101,8 +100,8 @@ def __init__( *, deployment_data: Optional["_models.CloudManifestFileDeploymentData"] = None, signature: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword deployment_data: Cloud specific manifest data. :paramtype deployment_data: ~azure.mgmt.azurestack.models.CloudManifestFileDeploymentData @@ -142,15 +141,15 @@ class Resource(_serialization.Model): "etag": {"key": "etag", "type": "str"}, } - def __init__(self, *, etag: Optional[str] = None, **kwargs): + def __init__(self, *, etag: Optional[str] = None, **kwargs: Any) -> None: """ :keyword etag: The entity tag used for optimistic concurrency when modifying the resource. :paramtype etag: str """ super().__init__(**kwargs) - self.id = None - self.name = None - self.type = None + self.id: Optional[str] = None + self.name: Optional[str] = None + self.type: Optional[str] = None self.etag = etag @@ -190,8 +189,8 @@ def __init__( *, etag: Optional[str] = None, properties: Optional["_models.CloudManifestFileProperties"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword etag: The entity tag used for optimistic concurrency when modifying the resource. :paramtype etag: str @@ -229,8 +228,8 @@ def __init__( message: Optional[str] = None, description: Optional[str] = None, issues: Optional[List[Union[str, "_models.CompatibilityIssue"]]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword is_compatible: Tells if product is compatible with current device. :paramtype is_compatible: bool @@ -279,7 +278,7 @@ class CustomerSubscription(Resource): "tenant_id": {"key": "properties.tenantId", "type": "str"}, } - def __init__(self, *, etag: Optional[str] = None, tenant_id: Optional[str] = None, **kwargs): + def __init__(self, *, etag: Optional[str] = None, tenant_id: Optional[str] = None, **kwargs: Any) -> None: """ :keyword etag: The entity tag used for optimistic concurrency when modifying the resource. :paramtype etag: str @@ -305,8 +304,12 @@ class CustomerSubscriptionList(_serialization.Model): } def __init__( - self, *, next_link: Optional[str] = None, value: Optional[List["_models.CustomerSubscription"]] = None, **kwargs - ): + self, + *, + next_link: Optional[str] = None, + value: Optional[List["_models.CustomerSubscription"]] = None, + **kwargs: Any + ) -> None: """ :keyword next_link: URI to the next page. :paramtype next_link: str @@ -339,11 +342,11 @@ class DataDiskImage(_serialization.Model): "source_blob_sas_uri": {"key": "sourceBlobSasUri", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.lun = None - self.source_blob_sas_uri = None + self.lun: Optional[int] = None + self.source_blob_sas_uri: Optional[str] = None class DeploymentLicenseRequest(_serialization.Model): @@ -357,7 +360,7 @@ class DeploymentLicenseRequest(_serialization.Model): "verification_version": {"key": "verificationVersion", "type": "str"}, } - def __init__(self, *, verification_version: Optional[str] = None, **kwargs): + def __init__(self, *, verification_version: Optional[str] = None, **kwargs: Any) -> None: """ :keyword verification_version: Signing verification public key version. :paramtype verification_version: str @@ -382,8 +385,8 @@ class DeploymentLicenseResponse(_serialization.Model): } def __init__( - self, *, temporary_license_chain: Optional[List[str]] = None, signature: Optional[str] = None, **kwargs - ): + self, *, temporary_license_chain: Optional[List[str]] = None, signature: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword temporary_license_chain: A license chain that can be used to temporarily activate an Azure Stack device. @@ -417,11 +420,11 @@ class DeviceConfiguration(_serialization.Model): "identity_system": {"key": "identitySystem", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.device_version = None - self.identity_system = None + self.device_version: Optional[str] = None + self.identity_system: Optional[Union[str, "_models.Category"]] = None class Display(_serialization.Model): @@ -455,8 +458,8 @@ def __init__( resource: Optional[str] = None, operation: Optional[str] = None, description: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword provider: The localized, friendly version of the resource provider name. :paramtype provider: str @@ -504,16 +507,17 @@ class ErrorDetails(_serialization.Model): "target": {"key": "target", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.code = None - self.message = None - self.target = None + self.code: Optional[str] = None + self.message: Optional[str] = None + self.target: Optional[str] = None class ErrorResponse(_serialization.Model): - """Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. + """Error response indicates that the service is not able to process the incoming request. The + reason is provided in the error message. :ivar error: The details of the error. :vartype error: ~azure.mgmt.azurestack.models.ErrorDetails @@ -523,7 +527,7 @@ class ErrorResponse(_serialization.Model): "error": {"key": "error", "type": "ErrorDetails"}, } - def __init__(self, *, error: Optional["_models.ErrorDetails"] = None, **kwargs): + def __init__(self, *, error: Optional["_models.ErrorDetails"] = None, **kwargs: Any) -> None: """ :keyword error: The details of the error. :paramtype error: ~azure.mgmt.azurestack.models.ErrorDetails @@ -532,7 +536,7 @@ def __init__(self, *, error: Optional["_models.ErrorDetails"] = None, **kwargs): self.error = error -class ExtendedProduct(_serialization.Model): # pylint: disable=too-many-instance-attributes +class ExtendedProduct(_serialization.Model): """Extended description about the product required for installing it into Azure Stack. Variables are only populated by the server, and will be ignored when sending a request. @@ -598,21 +602,21 @@ class ExtendedProduct(_serialization.Model): # pylint: disable=too-many-instanc "data_disk_images": {"key": "properties.dataDiskImages", "type": "[DataDiskImage]"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.gallery_package_blob_sas_uri = None - self.product_kind = None - self.compute_role = None - self.is_system_extension = None - self.support_multiple_extensions = None - self.version_properties_version = None - self.vm_os_type = None - self.vm_scale_set_enabled = None - self.uri = None - self.version = None - self.os_disk_image = None - self.data_disk_images = None + self.gallery_package_blob_sas_uri: Optional[str] = None + self.product_kind: Optional[str] = None + self.compute_role: Optional[Union[str, "_models.ComputeRole"]] = None + self.is_system_extension: Optional[bool] = None + self.support_multiple_extensions: Optional[bool] = None + self.version_properties_version: Optional[str] = None + self.vm_os_type: Optional[Union[str, "_models.OperatingSystem"]] = None + self.vm_scale_set_enabled: Optional[bool] = None + self.uri: Optional[str] = None + self.version: Optional[str] = None + self.os_disk_image: Optional["_models.OsDiskImage"] = None + self.data_disk_images: Optional[List["_models.DataDiskImage"]] = None class VirtualMachineProductProperties(_serialization.Model): @@ -640,12 +644,12 @@ class VirtualMachineProductProperties(_serialization.Model): "data_disk_images": {"key": "dataDiskImages", "type": "[DataDiskImage]"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.version = None - self.os_disk_image = None - self.data_disk_images = None + self.version: Optional[str] = None + self.os_disk_image: Optional["_models.OsDiskImage"] = None + self.data_disk_images: Optional[List["_models.DataDiskImage"]] = None class VirtualMachineExtensionProductProperties(_serialization.Model): @@ -692,16 +696,16 @@ class VirtualMachineExtensionProductProperties(_serialization.Model): "uri": {"key": "sourceBlob.uri", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.compute_role = None - self.is_system_extension = None - self.support_multiple_extensions = None - self.version = None - self.vm_os_type = None - self.vm_scale_set_enabled = None - self.uri = None + self.compute_role: Optional[Union[str, "_models.ComputeRole"]] = None + self.is_system_extension: Optional[bool] = None + self.support_multiple_extensions: Optional[bool] = None + self.version: Optional[str] = None + self.vm_os_type: Optional[Union[str, "_models.OperatingSystem"]] = None + self.vm_scale_set_enabled: Optional[bool] = None + self.uri: Optional[str] = None class ExtendedProductProperties(VirtualMachineExtensionProductProperties, VirtualMachineProductProperties): @@ -756,18 +760,18 @@ class ExtendedProductProperties(VirtualMachineExtensionProductProperties, Virtua "uri": {"key": "sourceBlob.uri", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.os_disk_image = None - self.data_disk_images = None - self.compute_role = None - self.is_system_extension = None - self.support_multiple_extensions = None - self.version = None - self.vm_os_type = None - self.vm_scale_set_enabled = None - self.uri = None + self.os_disk_image: Optional["_models.OsDiskImage"] = None + self.data_disk_images: Optional[List["_models.DataDiskImage"]] = None + self.compute_role: Optional[Union[str, "_models.ComputeRole"]] = None + self.is_system_extension: Optional[bool] = None + self.support_multiple_extensions: Optional[bool] = None + self.version: Optional[str] = None + self.vm_os_type: Optional[Union[str, "_models.OperatingSystem"]] = None + self.vm_scale_set_enabled: Optional[bool] = None + self.uri: Optional[str] = None class IconUris(_serialization.Model): @@ -801,8 +805,8 @@ def __init__( medium: Optional[str] = None, small: Optional[str] = None, hero: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword large: URI to large icon. :paramtype large: str @@ -852,13 +856,13 @@ class MarketplaceProductLogUpdate(_serialization.Model): "details": {"key": "details", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.operation = None - self.status = None - self.error = None - self.details = None + self.operation: Optional[str] = None + self.status: Optional[str] = None + self.error: Optional[str] = None + self.details: Optional[str] = None class Operation(_serialization.Model): @@ -885,8 +889,8 @@ def __init__( name: Optional[str] = None, display: Optional["_models.Display"] = None, origin: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword name: The name of the operation being performed on this particular object. :paramtype name: str @@ -916,7 +920,9 @@ class OperationList(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.Operation"]] = None, next_link: Optional[str] = None, **kwargs): + def __init__( + self, *, value: Optional[List["_models.Operation"]] = None, next_link: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword value: Array of operations. :paramtype value: list[~azure.mgmt.azurestack.models.Operation] @@ -950,14 +956,14 @@ class OsDiskImage(_serialization.Model): "source_blob_sas_uri": {"key": "sourceBlobSasUri", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.operating_system = None - self.source_blob_sas_uri = None + self.operating_system: Optional[Union[str, "_models.OperatingSystem"]] = None + self.source_blob_sas_uri: Optional[str] = None -class Product(Resource): # pylint: disable=too-many-instance-attributes +class Product(Resource): """Product information. Variables are only populated by the server, and will be ignored when sending a request. @@ -1061,8 +1067,8 @@ def __init__( product_kind: Optional[str] = None, product_properties: Optional["_models.ProductProperties"] = None, compatibility: Optional["_models.Compatibility"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword etag: The entity tag used for optimistic concurrency when modifying the resource. :paramtype etag: str @@ -1139,7 +1145,7 @@ class ProductLink(_serialization.Model): "uri": {"key": "uri", "type": "str"}, } - def __init__(self, *, display_name: Optional[str] = None, uri: Optional[str] = None, **kwargs): + def __init__(self, *, display_name: Optional[str] = None, uri: Optional[str] = None, **kwargs: Any) -> None: """ :keyword display_name: The description of the link. :paramtype display_name: str @@ -1165,7 +1171,9 @@ class ProductList(_serialization.Model): "value": {"key": "value", "type": "[Product]"}, } - def __init__(self, *, next_link: Optional[str] = None, value: Optional[List["_models.Product"]] = None, **kwargs): + def __init__( + self, *, next_link: Optional[str] = None, value: Optional[List["_models.Product"]] = None, **kwargs: Any + ) -> None: """ :keyword next_link: URI to the next page. :paramtype next_link: str @@ -1177,7 +1185,7 @@ def __init__(self, *, next_link: Optional[str] = None, value: Optional[List["_mo self.value = value -class ProductLog(_serialization.Model): # pylint: disable=too-many-instance-attributes +class ProductLog(_serialization.Model): """Product action log. Variables are only populated by the server, and will be ignored when sending a request. @@ -1234,20 +1242,20 @@ class ProductLog(_serialization.Model): # pylint: disable=too-many-instance-att "details": {"key": "details", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.id = None - self.product_id = None - self.subscription_id = None - self.registration_name = None - self.resource_group_name = None - self.operation = None - self.start_date = None - self.end_date = None - self.status = None - self.error = None - self.details = None + self.id: Optional[str] = None + self.product_id: Optional[str] = None + self.subscription_id: Optional[str] = None + self.registration_name: Optional[str] = None + self.resource_group_name: Optional[str] = None + self.operation: Optional[str] = None + self.start_date: Optional[str] = None + self.end_date: Optional[str] = None + self.status: Optional[str] = None + self.error: Optional[str] = None + self.details: Optional[str] = None class ProductProperties(_serialization.Model): @@ -1261,7 +1269,7 @@ class ProductProperties(_serialization.Model): "version": {"key": "version", "type": "str"}, } - def __init__(self, *, version: Optional[str] = None, **kwargs): + def __init__(self, *, version: Optional[str] = None, **kwargs: Any) -> None: """ :keyword version: The version. :paramtype version: str @@ -1275,7 +1283,7 @@ class TrackedResource(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar id: ID of the resource. :vartype id: str @@ -1283,7 +1291,7 @@ class TrackedResource(_serialization.Model): :vartype name: str :ivar type: Type of Resource. :vartype type: str - :ivar location: Location of the resource. Required. "global" + :ivar location: Location of the resource. Required. Known values are: "global" and "global". :vartype location: str or ~azure.mgmt.azurestack.models.Location :ivar tags: Custom tags for the resource. :vartype tags: dict[str, str] @@ -1313,10 +1321,10 @@ def __init__( location: Union[str, "_models.Location"], tags: Optional[Dict[str, str]] = None, etag: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ - :keyword location: Location of the resource. Required. "global" + :keyword location: Location of the resource. Required. Known values are: "global" and "global". :paramtype location: str or ~azure.mgmt.azurestack.models.Location :keyword tags: Custom tags for the resource. :paramtype tags: dict[str, str] @@ -1324,9 +1332,9 @@ def __init__( :paramtype etag: str """ super().__init__(**kwargs) - self.id = None - self.name = None - self.type = None + self.id: Optional[str] = None + self.name: Optional[str] = None + self.type: Optional[str] = None self.location = location self.tags = tags self.etag = etag @@ -1337,7 +1345,7 @@ class Registration(TrackedResource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar id: ID of the resource. :vartype id: str @@ -1345,7 +1353,7 @@ class Registration(TrackedResource): :vartype name: str :ivar type: Type of Resource. :vartype type: str - :ivar location: Location of the resource. Required. "global" + :ivar location: Location of the resource. Required. Known values are: "global" and "global". :vartype location: str or ~azure.mgmt.azurestack.models.Location :ivar tags: Custom tags for the resource. :vartype tags: dict[str, str] @@ -1387,10 +1395,10 @@ def __init__( object_id: Optional[str] = None, cloud_id: Optional[str] = None, billing_model: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ - :keyword location: Location of the resource. Required. "global" + :keyword location: Location of the resource. Required. Known values are: "global" and "global". :paramtype location: str or ~azure.mgmt.azurestack.models.Location :keyword tags: Custom tags for the resource. :paramtype tags: dict[str, str] @@ -1424,8 +1432,8 @@ class RegistrationList(_serialization.Model): } def __init__( - self, *, next_link: Optional[str] = None, value: Optional[List["_models.Registration"]] = None, **kwargs - ): + self, *, next_link: Optional[str] = None, value: Optional[List["_models.Registration"]] = None, **kwargs: Any + ) -> None: """ :keyword next_link: URI to the next page. :paramtype next_link: str @@ -1440,9 +1448,9 @@ def __init__( class RegistrationParameter(_serialization.Model): """Registration resource. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. - :ivar location: Location of the resource. Required. "global" + :ivar location: Location of the resource. Required. Known values are: "global" and "global". :vartype location: str or ~azure.mgmt.azurestack.models.Location :ivar registration_token: The token identifying registered Azure Stack. Required. :vartype registration_token: str @@ -1458,9 +1466,9 @@ class RegistrationParameter(_serialization.Model): "registration_token": {"key": "properties.registrationToken", "type": "str"}, } - def __init__(self, *, location: Union[str, "_models.Location"], registration_token: str, **kwargs): + def __init__(self, *, location: Union[str, "_models.Location"], registration_token: str, **kwargs: Any) -> None: """ - :keyword location: Location of the resource. Required. "global" + :keyword location: Location of the resource. Required. Known values are: "global" and "global". :paramtype location: str or ~azure.mgmt.azurestack.models.Location :keyword registration_token: The token identifying registered Azure Stack. Required. :paramtype registration_token: str diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/__init__.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/__init__.py index 61b0c93def0e..bdc04368c1e4 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/__init__.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/__init__.py @@ -5,16 +5,22 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._cloud_manifest_file_operations import CloudManifestFileOperations -from ._deployment_license_operations import DeploymentLicenseOperations -from ._customer_subscriptions_operations import CustomerSubscriptionsOperations -from ._products_operations import ProductsOperations -from ._registrations_operations import RegistrationsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._cloud_manifest_file_operations import CloudManifestFileOperations # type: ignore +from ._deployment_license_operations import DeploymentLicenseOperations # type: ignore +from ._customer_subscriptions_operations import CustomerSubscriptionsOperations # type: ignore +from ._products_operations import ProductsOperations # type: ignore +from ._registrations_operations import RegistrationsOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -25,5 +31,5 @@ "ProductsOperations", "RegistrationsOperations", ] -__all__.extend([p for p in _patch_all if p not in __all__]) +__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore _patch_sdk() diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_cloud_manifest_file_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_cloud_manifest_file_operations.py index 156b518e2f86..3548a4e3915a 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_cloud_manifest_file_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_cloud_manifest_file_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,10 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Optional, TypeVar +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -18,20 +18,15 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -43,7 +38,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -64,7 +59,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -73,7 +68,7 @@ def build_get_request( "verificationVersion": _SERIALIZER.url("verification_version", verification_version, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters if version_creation_date is not None: @@ -100,21 +95,22 @@ class CloudManifestFileOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: """Returns a cloud specific manifest JSON file with latest version. - :keyword callable cls: A custom type or function that will be passed the direct response :return: CloudManifestFileResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CloudManifestFileResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -125,22 +121,19 @@ def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CloudManifestFileResponse] = kwargs.pop("cls", None) - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -150,14 +143,12 @@ def list(self, **kwargs: Any) -> _models.CloudManifestFileResponse: error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response) + deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list.metadata = {"url": "/providers/Microsoft.AzureStack/cloudManifestFiles"} + return deserialized # type: ignore @distributed_trace def get( @@ -170,12 +161,11 @@ def get( :param version_creation_date: Signing verification key version creation date. Default value is None. :type version_creation_date: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CloudManifestFileResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CloudManifestFileResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -186,24 +176,21 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CloudManifestFileResponse] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( verification_version=verification_version, version_creation_date=version_creation_date, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -213,11 +200,9 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response) + deserialized = self._deserialize("CloudManifestFileResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = {"url": "/providers/Microsoft.AzureStack/cloudManifestFiles/{verificationVersion}"} + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_customer_subscriptions_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_customer_subscriptions_operations.py index c650ce501d3e..fb02fa4c0675 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_customer_subscriptions_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_customer_subscriptions_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +6,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -20,20 +22,15 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,21 +42,21 @@ def build_list_request(resource_group: str, registration_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,14 +73,14 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -91,7 +88,7 @@ def build_get_request( "customerSubscriptionName": _SERIALIZER.url("customer_subscription_name", customer_subscription_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -108,14 +105,14 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -123,7 +120,7 @@ def build_delete_request( "customerSubscriptionName": _SERIALIZER.url("customer_subscription_name", customer_subscription_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -140,7 +137,7 @@ def build_create_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -148,7 +145,7 @@ def build_create_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -156,7 +153,7 @@ def build_create_request( "customerSubscriptionName": _SERIALIZER.url("customer_subscription_name", customer_subscription_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -183,10 +180,12 @@ class CustomerSubscriptionsOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( @@ -198,7 +197,6 @@ def list( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CustomerSubscription or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.azurestack.models.CustomerSubscription] @@ -207,12 +205,10 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CustomerSubscriptionList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -223,17 +219,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -245,13 +239,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("CustomerSubscriptionList", pipeline_response) @@ -261,10 +254,11 @@ def extract_data(pipeline_response): return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -277,10 +271,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions" - } - @distributed_trace def get( self, resource_group: str, registration_name: str, customer_subscription_name: str, **kwargs: Any @@ -293,12 +283,11 @@ def get( :type registration_name: str :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -309,26 +298,23 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CustomerSubscription] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -338,16 +324,12 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CustomerSubscription", pipeline_response) + deserialized = self._deserialize("CustomerSubscription", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return deserialized # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements @@ -361,12 +343,11 @@ def delete( # pylint: disable=inconsistent-return-statements :type registration_name: str :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -377,26 +358,23 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -407,11 +385,7 @@ def delete( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload def create( @@ -438,7 +412,6 @@ def create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: @@ -450,7 +423,7 @@ def create( resource_group: str, registration_name: str, customer_subscription_name: str, - customer_creation_parameters: IO, + customer_creation_parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -465,11 +438,10 @@ def create( :type customer_subscription_name: str :param customer_creation_parameters: Parameters use to create a customer subscription. Required. - :type customer_creation_parameters: IO + :type customer_creation_parameters: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: @@ -481,7 +453,7 @@ def create( resource_group: str, registration_name: str, customer_subscription_name: str, - customer_creation_parameters: Union[_models.CustomerSubscription, IO], + customer_creation_parameters: Union[_models.CustomerSubscription, IO[bytes]], **kwargs: Any ) -> _models.CustomerSubscription: """Creates a new customer subscription under a registration. @@ -493,17 +465,14 @@ def create( :param customer_subscription_name: Name of the product. Required. :type customer_subscription_name: str :param customer_creation_parameters: Parameters use to create a customer subscription. Is - either a model type or a IO type. Required. - :type customer_creation_parameters: ~azure.mgmt.azurestack.models.CustomerSubscription or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + either a CustomerSubscription type or a IO[bytes] type. Required. + :type customer_creation_parameters: ~azure.mgmt.azurestack.models.CustomerSubscription or + IO[bytes] :return: CustomerSubscription or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.CustomerSubscription :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -514,21 +483,19 @@ def create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CustomerSubscription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(customer_creation_parameters, (IO, bytes)): + if isinstance(customer_creation_parameters, (IOBase, bytes)): _content = customer_creation_parameters else: _json = self._serialize.body(customer_creation_parameters, "CustomerSubscription") - request = build_create_request( + _request = build_create_request( resource_group=resource_group, registration_name=registration_name, customer_subscription_name=customer_subscription_name, @@ -537,15 +504,14 @@ def create( content_type=content_type, json=_json, content=_content, - template_url=self.create.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -555,13 +521,9 @@ def create( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CustomerSubscription", pipeline_response) + deserialized = self._deserialize("CustomerSubscription", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/customerSubscriptions/{customerSubscriptionName}" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_deployment_license_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_deployment_license_operations.py index 7f6f179cbd35..0cb99d81c5be 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_deployment_license_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_deployment_license_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -18,20 +19,15 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -43,19 +39,19 @@ def build_create_request(subscription_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.AzureStack/generateDeploymentLicense" - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,10 +78,12 @@ class DeploymentLicenseOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @overload def create( @@ -102,7 +100,6 @@ def create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -110,16 +107,15 @@ def create( @overload def create( - self, deployment_license_request: IO, *, content_type: str = "application/json", **kwargs: Any + self, deployment_license_request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.DeploymentLicenseResponse: """Creates a license that can be used to deploy an Azure Stack device. :param deployment_license_request: Request body for creating a deployment license. Required. - :type deployment_license_request: IO + :type deployment_license_request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -127,22 +123,19 @@ def create( @distributed_trace def create( - self, deployment_license_request: Union[_models.DeploymentLicenseRequest, IO], **kwargs: Any + self, deployment_license_request: Union[_models.DeploymentLicenseRequest, IO[bytes]], **kwargs: Any ) -> _models.DeploymentLicenseResponse: """Creates a license that can be used to deploy an Azure Stack device. :param deployment_license_request: Request body for creating a deployment license. Is either a - model type or a IO type. Required. - :type deployment_license_request: ~azure.mgmt.azurestack.models.DeploymentLicenseRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + DeploymentLicenseRequest type or a IO[bytes] type. Required. + :type deployment_license_request: ~azure.mgmt.azurestack.models.DeploymentLicenseRequest or + IO[bytes] :return: DeploymentLicenseResponse or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.DeploymentLicenseResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -153,35 +146,32 @@ def create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.DeploymentLicenseResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(deployment_license_request, (IO, bytes)): + if isinstance(deployment_license_request, (IOBase, bytes)): _content = deployment_license_request else: _json = self._serialize.body(deployment_license_request, "DeploymentLicenseRequest") - request = build_create_request( + _request = build_create_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.create.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -191,13 +181,9 @@ def create( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DeploymentLicenseResponse", pipeline_response) + deserialized = self._deserialize("DeploymentLicenseResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.AzureStack/generateDeploymentLicense" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_operations.py index b1324b536198..48991c41de84 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -20,20 +20,15 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,7 +40,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -74,16 +69,17 @@ class Operations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: """Returns the list of supported REST operations. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.azurestack.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -91,12 +87,10 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -107,14 +101,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -126,13 +118,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("OperationList", pipeline_response) @@ -142,10 +133,11 @@ def extract_data(pipeline_response): return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -157,5 +149,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.AzureStack/operations"} diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_products_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_products_operations.py index 6c559e2e14c5..90a4d4342e7a 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_products_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_products_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression,too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +6,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -20,20 +22,15 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,21 +42,21 @@ def build_list_request(resource_group: str, registration_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,14 +73,14 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -91,7 +88,7 @@ def build_get_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -108,14 +105,14 @@ def build_list_details_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listDetails", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -123,7 +120,7 @@ def build_list_details_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -140,7 +137,7 @@ def build_list_products_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -148,7 +145,7 @@ def build_list_products_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listProducts", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -156,7 +153,7 @@ def build_list_products_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -175,7 +172,7 @@ def build_get_products_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -183,7 +180,7 @@ def build_get_products_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProducts", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -191,7 +188,7 @@ def build_get_products_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,7 +207,7 @@ def build_get_product_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -218,7 +215,7 @@ def build_get_product_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProduct", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -226,7 +223,7 @@ def build_get_product_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -245,7 +242,7 @@ def build_upload_log_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -253,7 +250,7 @@ def build_upload_log_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/uploadProductLog", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), @@ -261,7 +258,7 @@ def build_upload_log_request( "productName": _SERIALIZER.url("product_name", product_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -288,10 +285,12 @@ class ProductsOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> Iterable["_models.Product"]: @@ -301,7 +300,6 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> It :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Product or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.azurestack.models.Product] :raises ~azure.core.exceptions.HttpResponseError: @@ -309,12 +307,10 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> It _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -325,17 +321,15 @@ def list(self, resource_group: str, registration_name: str, **kwargs: Any) -> It def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -347,13 +341,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("ProductList", pipeline_response) @@ -363,10 +356,11 @@ def extract_data(pipeline_response): return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -379,10 +373,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products" - } - @distributed_trace def get(self, resource_group: str, registration_name: str, product_name: str, **kwargs: Any) -> _models.Product: """Returns the specified product. @@ -393,12 +383,11 @@ def get(self, resource_group: str, registration_name: str, product_name: str, ** :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -409,26 +398,23 @@ def get(self, resource_group: str, registration_name: str, product_name: str, ** _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Product] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -438,16 +424,12 @@ def get(self, resource_group: str, registration_name: str, product_name: str, ** error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Product", pipeline_response) + deserialized = self._deserialize("Product", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}" - } + return deserialized # type: ignore @distributed_trace def list_details( @@ -461,12 +443,11 @@ def list_details( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExtendedProduct or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ExtendedProduct :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -477,26 +458,23 @@ def list_details( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExtendedProduct] = kwargs.pop("cls", None) - request = build_list_details_request( + _request = build_list_details_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_details.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -506,16 +484,12 @@ def list_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExtendedProduct", pipeline_response) + deserialized = self._deserialize("ExtendedProduct", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listDetails" - } + return deserialized # type: ignore @overload def list_products( @@ -541,7 +515,6 @@ def list_products( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -553,7 +526,7 @@ def list_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -567,11 +540,10 @@ def list_products( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -583,7 +555,7 @@ def list_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductList: """Returns a list of products. @@ -594,18 +566,14 @@ def list_products( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -616,16 +584,14 @@ def list_products( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -633,7 +599,7 @@ def list_products( else: _json = None - request = build_list_products_request( + _request = build_list_products_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -642,15 +608,14 @@ def list_products( content_type=content_type, json=_json, content=_content, - template_url=self.list_products.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -660,16 +625,12 @@ def list_products( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductList", pipeline_response) + deserialized = self._deserialize("ProductList", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - list_products.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/listProducts" - } + return deserialized # type: ignore @overload def get_products( @@ -695,7 +656,6 @@ def get_products( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -707,7 +667,7 @@ def get_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -721,11 +681,10 @@ def get_products( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: @@ -737,7 +696,7 @@ def get_products( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductList: """Returns a list of products. @@ -748,18 +707,14 @@ def get_products( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: ProductList or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductList :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -770,16 +725,14 @@ def get_products( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductList] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -787,7 +740,7 @@ def get_products( else: _json = None - request = build_get_products_request( + _request = build_get_products_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -796,15 +749,14 @@ def get_products( content_type=content_type, json=_json, content=_content, - template_url=self.get_products.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -814,16 +766,12 @@ def get_products( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductList", pipeline_response) + deserialized = self._deserialize("ProductList", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get_products.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProducts" - } + return deserialized # type: ignore @overload def get_product( @@ -849,7 +797,6 @@ def get_product( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: @@ -861,7 +808,7 @@ def get_product( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[IO] = None, + device_configuration: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -875,11 +822,10 @@ def get_product( :param product_name: Name of the product. Required. :type product_name: str :param device_configuration: Device configuration. Default value is None. - :type device_configuration: IO + :type device_configuration: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: @@ -891,7 +837,7 @@ def get_product( resource_group: str, registration_name: str, product_name: str, - device_configuration: Optional[Union[_models.DeviceConfiguration, IO]] = None, + device_configuration: Optional[Union[_models.DeviceConfiguration, IO[bytes]]] = None, **kwargs: Any ) -> _models.Product: """Returns the specified product. @@ -902,18 +848,14 @@ def get_product( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param device_configuration: Device configuration. Is either a model type or a IO type. Default - value is None. - :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param device_configuration: Device configuration. Is either a DeviceConfiguration type or a + IO[bytes] type. Default value is None. + :type device_configuration: ~azure.mgmt.azurestack.models.DeviceConfiguration or IO[bytes] :return: Product or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Product :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -924,16 +866,14 @@ def get_product( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Product] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(device_configuration, (IO, bytes)): + if isinstance(device_configuration, (IOBase, bytes)): _content = device_configuration else: if device_configuration is not None: @@ -941,7 +881,7 @@ def get_product( else: _json = None - request = build_get_product_request( + _request = build_get_product_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -950,15 +890,14 @@ def get_product( content_type=content_type, json=_json, content=_content, - template_url=self.get_product.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -968,16 +907,12 @@ def get_product( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Product", pipeline_response) + deserialized = self._deserialize("Product", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get_product.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/getProduct" - } + return deserialized # type: ignore @overload def upload_log( @@ -1003,7 +938,6 @@ def upload_log( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: @@ -1015,7 +949,7 @@ def upload_log( resource_group: str, registration_name: str, product_name: str, - marketplace_product_log_update: Optional[IO] = None, + marketplace_product_log_update: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1029,11 +963,10 @@ def upload_log( :param product_name: Name of the product. Required. :type product_name: str :param marketplace_product_log_update: Update details for product log. Default value is None. - :type marketplace_product_log_update: IO + :type marketplace_product_log_update: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: @@ -1045,7 +978,7 @@ def upload_log( resource_group: str, registration_name: str, product_name: str, - marketplace_product_log_update: Optional[Union[_models.MarketplaceProductLogUpdate, IO]] = None, + marketplace_product_log_update: Optional[Union[_models.MarketplaceProductLogUpdate, IO[bytes]]] = None, **kwargs: Any ) -> _models.ProductLog: """Returns the specified product. @@ -1056,19 +989,15 @@ def upload_log( :type registration_name: str :param product_name: Name of the product. Required. :type product_name: str - :param marketplace_product_log_update: Update details for product log. Is either a model type - or a IO type. Default value is None. + :param marketplace_product_log_update: Update details for product log. Is either a + MarketplaceProductLogUpdate type or a IO[bytes] type. Default value is None. :type marketplace_product_log_update: ~azure.mgmt.azurestack.models.MarketplaceProductLogUpdate - or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + or IO[bytes] :return: ProductLog or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ProductLog :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1079,16 +1008,14 @@ def upload_log( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ProductLog] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(marketplace_product_log_update, (IO, bytes)): + if isinstance(marketplace_product_log_update, (IOBase, bytes)): _content = marketplace_product_log_update else: if marketplace_product_log_update is not None: @@ -1096,7 +1023,7 @@ def upload_log( else: _json = None - request = build_upload_log_request( + _request = build_upload_log_request( resource_group=resource_group, registration_name=registration_name, product_name=product_name, @@ -1105,15 +1032,14 @@ def upload_log( content_type=content_type, json=_json, content=_content, - template_url=self.upload_log.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1123,13 +1049,9 @@ def upload_log( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ProductLog", pipeline_response) + deserialized = self._deserialize("ProductLog", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - upload_log.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/products/{productName}/uploadProductLog" - } + return deserialized # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_registrations_operations.py b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_registrations_operations.py index f6523cce956b..469ddce99649 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_registrations_operations.py +++ b/sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/operations/_registrations_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +6,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from collections.abc import MutableMapping +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -20,20 +22,15 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._configuration import AzureStackManagementClientConfiguration +from .._utils.serialization import Deserializer, Serializer -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,20 +42,20 @@ def build_list_request(resource_group: str, subscription_id: str, **kwargs: Any) _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -73,7 +70,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -82,7 +79,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -97,21 +94,21 @@ def build_get_request(resource_group: str, registration_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -128,21 +125,21 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -159,7 +156,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -167,14 +164,14 @@ def build_create_or_update_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -193,7 +190,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -201,14 +198,14 @@ def build_update_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -227,21 +224,21 @@ def build_get_activation_key_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-06-01")) accept = _headers.pop("Accept", "application/json") # Construct URL _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/getactivationkey", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -263,14 +260,14 @@ def build_enable_remote_management_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/enableRemoteManagement", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "resourceGroup": _SERIALIZER.url("resource_group", resource_group, "str"), "registrationName": _SERIALIZER.url("registration_name", registration_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct headers _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") @@ -292,10 +289,12 @@ class RegistrationsOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: AzureStackManagementClientConfiguration = ( + input_args.pop(0) if input_args else kwargs.pop("config") + ) + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, resource_group: str, **kwargs: Any) -> Iterable["_models.Registration"]: @@ -303,7 +302,6 @@ def list(self, resource_group: str, **kwargs: Any) -> Iterable["_models.Registra :param resource_group: Name of the resource group. Required. :type resource_group: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Registration or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.azurestack.models.Registration] :raises ~azure.core.exceptions.HttpResponseError: @@ -311,12 +309,10 @@ def list(self, resource_group: str, **kwargs: Any) -> Iterable["_models.Registra _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RegistrationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -327,16 +323,14 @@ def list(self, resource_group: str, **kwargs: Any) -> Iterable["_models.Registra def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group=resource_group, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -348,13 +342,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("RegistrationList", pipeline_response) @@ -364,10 +357,11 @@ def extract_data(pipeline_response): return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -380,15 +374,10 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations" - } - @distributed_trace def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Registration"]: """Returns a list of all registrations under current subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Registration or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.azurestack.models.Registration] :raises ~azure.core.exceptions.HttpResponseError: @@ -396,12 +385,10 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Registration" _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RegistrationList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -412,15 +399,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Registration" def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -432,13 +417,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("RegistrationList", pipeline_response) @@ -448,10 +432,11 @@ def extract_data(pipeline_response): return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): - request = prepare_request(next_link) + _request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -464,10 +449,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.AzureStack/registrations" - } - @distributed_trace def get(self, resource_group: str, registration_name: str, **kwargs: Any) -> _models.Registration: """Returns the properties of an Azure Stack registration. @@ -476,12 +457,11 @@ def get(self, resource_group: str, registration_name: str, **kwargs: Any) -> _mo :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -492,25 +472,22 @@ def get(self, resource_group: str, registration_name: str, **kwargs: Any) -> _mo _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -520,16 +497,12 @@ def get(self, resource_group: str, registration_name: str, **kwargs: Any) -> _mo error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return deserialized # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements @@ -541,12 +514,11 @@ def delete( # pylint: disable=inconsistent-return-statements :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -557,25 +529,22 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -586,11 +555,7 @@ def delete( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload def create_or_update( @@ -613,7 +578,6 @@ def create_or_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -624,7 +588,7 @@ def create_or_update( self, resource_group: str, registration_name: str, - token: IO, + token: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -636,11 +600,10 @@ def create_or_update( :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str :param token: Registration token. Required. - :type token: IO + :type token: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -651,7 +614,7 @@ def create_or_update( self, resource_group: str, registration_name: str, - token: Union[_models.RegistrationParameter, IO], + token: Union[_models.RegistrationParameter, IO[bytes]], **kwargs: Any ) -> _models.Registration: """Create or update an Azure Stack registration. @@ -660,17 +623,14 @@ def create_or_update( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :param token: Registration token. Is either a model type or a IO type. Required. - :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param token: Registration token. Is either a RegistrationParameter type or a IO[bytes] type. + Required. + :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO[bytes] :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -681,21 +641,19 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(token, (IO, bytes)): + if isinstance(token, (IOBase, bytes)): _content = token else: _json = self._serialize.body(token, "RegistrationParameter") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, @@ -703,15 +661,14 @@ def create_or_update( content_type=content_type, json=_json, content=_content, - template_url=self.create_or_update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -721,21 +678,13 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("Registration", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } - @overload def update( self, @@ -757,7 +706,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -768,7 +716,7 @@ def update( self, resource_group: str, registration_name: str, - token: IO, + token: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -780,11 +728,10 @@ def update( :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str :param token: Registration token. Required. - :type token: IO + :type token: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: @@ -795,7 +742,7 @@ def update( self, resource_group: str, registration_name: str, - token: Union[_models.RegistrationParameter, IO], + token: Union[_models.RegistrationParameter, IO[bytes]], **kwargs: Any ) -> _models.Registration: """Patch an Azure Stack registration. @@ -804,17 +751,14 @@ def update( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :param token: Registration token. Is either a model type or a IO type. Required. - :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param token: Registration token. Is either a RegistrationParameter type or a IO[bytes] type. + Required. + :type token: ~azure.mgmt.azurestack.models.RegistrationParameter or IO[bytes] :return: Registration or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.Registration :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -825,21 +769,19 @@ def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Registration] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(token, (IO, bytes)): + if isinstance(token, (IOBase, bytes)): _content = token else: _json = self._serialize.body(token, "RegistrationParameter") - request = build_update_request( + _request = build_update_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, @@ -847,15 +789,14 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -865,16 +806,12 @@ def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Registration", pipeline_response) + deserialized = self._deserialize("Registration", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}" - } + return deserialized # type: ignore @distributed_trace def get_activation_key( @@ -886,12 +823,11 @@ def get_activation_key( :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ActivationKeyResult or the result of cls(response) :rtype: ~azure.mgmt.azurestack.models.ActivationKeyResult :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -902,25 +838,22 @@ def get_activation_key( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-06-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ActivationKeyResult] = kwargs.pop("cls", None) - request = build_get_activation_key_request( + _request = build_get_activation_key_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_activation_key.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -930,16 +863,12 @@ def get_activation_key( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ActivationKeyResult", pipeline_response) + deserialized = self._deserialize("ActivationKeyResult", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_activation_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/getactivationkey" - } + return deserialized # type: ignore @distributed_trace def enable_remote_management( # pylint: disable=inconsistent-return-statements @@ -951,12 +880,11 @@ def enable_remote_management( # pylint: disable=inconsistent-return-statements :type resource_group: str :param registration_name: Name of the Azure Stack registration. Required. :type registration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -969,19 +897,18 @@ def enable_remote_management( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) - request = build_enable_remote_management_request( + _request = build_enable_remote_management_request( resource_group=resource_group, registration_name=registration_name, subscription_id=self._config.subscription_id, - template_url=self.enable_remote_management.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -992,8 +919,4 @@ def enable_remote_management( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - enable_remote_management.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.AzureStack/registrations/{registrationName}/enableRemoteManagement" - } + return cls(pipeline_response, None, {}) # type: ignore diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/get.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/get.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/get.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/get.py index c17ce003c316..b385b5af98c1 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/get.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/get.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/list.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/list.py new file mode 100644 index 000000000000..68c16e3d8af5 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/cloud_manifest_file/list.py @@ -0,0 +1,40 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python list.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="SUBSCRIPTION_ID", + ) + + response = client.cloud_manifest_file.list() + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/CloudManifestFile/List.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/delete.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/delete.py similarity index 94% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/delete.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/delete.py index 11ae13c20be5..a347fbd5bac7 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/delete.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/delete.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ @@ -29,12 +31,11 @@ def main(): subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", ) - response = client.customer_subscriptions.delete( + client.customer_subscriptions.delete( resource_group="azurestack", registration_name="testregistration", customer_subscription_name="E09A4E93-29A7-4EBA-A6D4-76202383F07F", ) - print(response) # x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/CustomerSubscription/Delete.json diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/get.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/get.py new file mode 100644 index 000000000000..2e78a3e720e0 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/get.py @@ -0,0 +1,44 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python get.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.customer_subscriptions.get( + resource_group="azurestack", + registration_name="testregistration", + customer_subscription_name="E09A4E93-29A7-4EBA-A6D4-76202383F07F", + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/CustomerSubscription/Get.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/list.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/list.py new file mode 100644 index 000000000000..89d8929e6240 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/list.py @@ -0,0 +1,44 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python list.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.customer_subscriptions.list( + resource_group="azurestack", + registration_name="testregistration", + ) + for item in response: + print(item) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/CustomerSubscription/List.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/put.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/put.py similarity index 97% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/put.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/put.py index a7067b5dacab..522bf8f5218c 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/put.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/customer_subscription/put.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/deployment_license/post.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/post.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/deployment_license/post.py index e7600f16de42..202d37a3513d 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/post.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/deployment_license/post.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/operation/list.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/list.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/operation/list.py index 592db19d5836..857aa812fbc8 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/operation/list.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get.py new file mode 100644 index 000000000000..0b3934734e21 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get.py @@ -0,0 +1,44 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python get.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.products.get( + resource_group="azurestack", + registration_name="testregistration", + product_name="Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1", + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Product/Get.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/get_post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get_post.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/get_post.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get_post.py index 6eb7a0454834..23ee0963da8b 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/get_post.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/get_post.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list.py new file mode 100644 index 000000000000..6e51b6c3cd25 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list.py @@ -0,0 +1,44 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python list.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.products.list( + resource_group="azurestack", + registration_name="testregistration", + ) + for item in response: + print(item) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Product/List.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list_post.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_post.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list_post.py index 72c74f727954..5f599c0045ed 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_post.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/list_post.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/post.py new file mode 100644 index 000000000000..27752118aabd --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/post.py @@ -0,0 +1,44 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python post.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.products.list_details( + resource_group="azurestack", + registration_name="testregistration", + product_name="Microsoft.OSTCExtensions.VMAccessForLinux.1.4.7.1", + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Product/Post.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/upload_log.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/upload_log.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/upload_log.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/upload_log.py index 29957b72fd20..d78e906b1385 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/upload_log.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/product/upload_log.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/delete.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/delete.py new file mode 100644 index 000000000000..669718f5624f --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/delete.py @@ -0,0 +1,42 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python delete.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + client.registrations.delete( + resource_group="azurestack", + registration_name="testregistration", + ) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Registration/Delete.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/get.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/get.py new file mode 100644 index 000000000000..4d663394e956 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/get.py @@ -0,0 +1,43 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python get.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.registrations.get( + resource_group="azurestack", + registration_name="testregistration", + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Registration/Get.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list.py new file mode 100644 index 000000000000..276efcae3efc --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list.py @@ -0,0 +1,43 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python list.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.registrations.list( + resource_group="azurestack", + ) + for item in response: + print(item) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Registration/List.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_by_subscription.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list_by_subscription.py similarity index 96% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_by_subscription.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list_by_subscription.py index 2d3e60070bf6..86cb6048707a 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/list_by_subscription.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/list_by_subscription.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/patch.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/patch.py similarity index 97% rename from sdk/azurestack/azure-mgmt-azurestack/generated_samples/patch.py rename to sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/patch.py index bca752557e72..a4e7818a9ca5 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/patch.py +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/patch.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.azurestack import AzureStackManagementClient """ diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/post.py new file mode 100644 index 000000000000..d3e01ca7bf44 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/post.py @@ -0,0 +1,43 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python post.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.registrations.get_activation_key( + resource_group="azurestack", + registration_name="testregistration", + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Registration/Post.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/put.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/put.py new file mode 100644 index 000000000000..587be6a96825 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/registration/put.py @@ -0,0 +1,49 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python put.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + response = client.registrations.create_or_update( + resource_group="azurestack", + registration_name="testregistration", + token={ + "location": "global", + "properties": { + "registrationToken": "EyjIAWXSAw5nTw9KZWWiOiJeZxZlbg9wBwvUdCiSIM9iaMVjdeLkijoinwIzyJa2Ytgtowm2yy00OdG4lTlLyJmtztHjZGfJZTC0NZK1iIWiY2XvdWRJzCi6iJy5nDy0oDk1LTNHmWeTnDUwyS05oDI0LTrINzYwoGq5mjAzziIsim1HCmtldHBsYwnLu3LuZGljYXrpB25FBmfIbgVkIJp0CNvLLCJOYXJkd2FYzuLUZM8iOlt7IM51bunvcMVZiJoYlCjcaw9ZiJPBIjNkzDJHmda3yte5ndqZMdq4YmZkZmi5oDM3OTY3ZwNMIL0SIM5PyYI6WyJLZTy0ztJJMwZKy2m0OWNLODDLMwm2zTm0ymzKyjmWySisiJA3njlHmtdlY2q4NjRjnwFIZtC1YZi5ZGyZodM3Y2vjIl0siMnwDsi6wyi2oDUZoTbiY2RhNDa0ymrKoWe4YtK5otblzWrJzGyzNCISIjmYnzC4M2vmnZdIoDRKM2i5ytfkmJlhnDc1zdhLzWm1il0sim5HBwuiOijIqzF1MTvhmDIXmIIsimrpc2SiolsioWNlZjVhnZM1otQ0nDu3NmjlN2M3zmfjzmyZMTJhZtiiLcjLZjLmmZJhmWVhytG0NTu0OTqZNWu1Mda0MZbIYtfjyijdLCj1DWlKijoinwM5Mwu3NjytMju5Os00oTIwlWi0OdmTnGzHotiWm2RjyTCxIIwiBWvTb3J5ijPbijAYZDA3M2fjNzu0YTRMZTfhodkxzDnkogY5ZtAWzdyXIiwINZcWzThLnDQ4otrJndAzZGI5MGzlYtY1ZJA5ZdfiNMQIXX1DlcJpC3n1zxiiOijZb21lB25LIIWIdmVyC2LVbiI6IJeuMcJ9" + }, + }, + ) + print(response) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/Registration/Put.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_samples/remote_management/post.py b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/remote_management/post.py new file mode 100644 index 000000000000..428e1056e2ea --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_samples/remote_management/post.py @@ -0,0 +1,42 @@ +# pylint: disable=line-too-long,useless-suppression +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.azurestack import AzureStackManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-azurestack +# USAGE + python post.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureStackManagementClient( + credential=DefaultAzureCredential(), + subscription_id="dd8597b4-8739-4467-8b10-f8679f62bfbf", + ) + + client.registrations.enable_remote_management( + resource_group="azurestack", + registration_name="testregistration", + ) + + +# x-ms-original-file: specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2022-06-01/examples/RemoteManagement/Post.json +if __name__ == "__main__": + main() diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/conftest.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/conftest.py new file mode 100644 index 000000000000..e89db8f02da8 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/conftest.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# For security, please avoid record sensitive identity information in recordings +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + azurestackmanagement_subscription_id = os.environ.get( + "AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + azurestackmanagement_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + azurestackmanagement_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + azurestackmanagement_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer( + regex=azurestackmanagement_subscription_id, value="00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer(regex=azurestackmanagement_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=azurestackmanagement_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=azurestackmanagement_client_secret, value="00000000-0000-0000-0000-000000000000") + + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations.py new file mode 100644 index 000000000000..6d54a57d2978 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementCloudManifestFileOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_cloud_manifest_file_list(self, resource_group): + response = self.client.cloud_manifest_file.list( + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_cloud_manifest_file_get(self, resource_group): + response = self.client.cloud_manifest_file.get( + verification_version="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations_async.py new file mode 100644 index 000000000000..c4f97374622a --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_cloud_manifest_file_operations_async.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementCloudManifestFileOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_cloud_manifest_file_list(self, resource_group): + response = await self.client.cloud_manifest_file.list( + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_cloud_manifest_file_get(self, resource_group): + response = await self.client.cloud_manifest_file.get( + verification_version="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations.py new file mode 100644 index 000000000000..ebd5ec426262 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations.py @@ -0,0 +1,71 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementCustomerSubscriptionsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_customer_subscriptions_list(self, resource_group): + response = self.client.customer_subscriptions.list( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_customer_subscriptions_get(self, resource_group): + response = self.client.customer_subscriptions.get( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_customer_subscriptions_delete(self, resource_group): + response = self.client.customer_subscriptions.delete( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_customer_subscriptions_create(self, resource_group): + response = self.client.customer_subscriptions.create( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + customer_creation_parameters={"etag": "str", "id": "str", "name": "str", "tenantId": "str", "type": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations_async.py new file mode 100644 index 000000000000..20b089a2da24 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_customer_subscriptions_operations_async.py @@ -0,0 +1,72 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementCustomerSubscriptionsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_customer_subscriptions_list(self, resource_group): + response = self.client.customer_subscriptions.list( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_customer_subscriptions_get(self, resource_group): + response = await self.client.customer_subscriptions.get( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_customer_subscriptions_delete(self, resource_group): + response = await self.client.customer_subscriptions.delete( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_customer_subscriptions_create(self, resource_group): + response = await self.client.customer_subscriptions.create( + resource_group="str", + registration_name="str", + customer_subscription_name="str", + customer_creation_parameters={"etag": "str", "id": "str", "name": "str", "tenantId": "str", "type": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations.py new file mode 100644 index 000000000000..152a676c0ac5 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations.py @@ -0,0 +1,30 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementDeploymentLicenseOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_deployment_license_create(self, resource_group): + response = self.client.deployment_license.create( + deployment_license_request={"verificationVersion": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations_async.py new file mode 100644 index 000000000000..9bd727a8ed74 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_deployment_license_operations_async.py @@ -0,0 +1,31 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementDeploymentLicenseOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_deployment_license_create(self, resource_group): + response = await self.client.deployment_license.create( + deployment_license_request={"verificationVersion": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations.py new file mode 100644 index 000000000000..79d5d009dfcd --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2022-06-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations_async.py new file mode 100644 index 000000000000..054fc8bd2a8a --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_operations_async.py @@ -0,0 +1,30 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2022-06-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations.py new file mode 100644 index 000000000000..08d8b3ec1686 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations.py @@ -0,0 +1,109 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementProductsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_list(self, resource_group): + response = self.client.products.list( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_get(self, resource_group): + response = self.client.products.get( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_list_details(self, resource_group): + response = self.client.products.list_details( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_list_products(self, resource_group): + response = self.client.products.list_products( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_get_products(self, resource_group): + response = self.client.products.get_products( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_get_product(self, resource_group): + response = self.client.products.get_product( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_products_upload_log(self, resource_group): + response = self.client.products.upload_log( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations_async.py new file mode 100644 index 000000000000..4d5443df5396 --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_products_operations_async.py @@ -0,0 +1,110 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementProductsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_list(self, resource_group): + response = self.client.products.list( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_get(self, resource_group): + response = await self.client.products.get( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_list_details(self, resource_group): + response = await self.client.products.list_details( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_list_products(self, resource_group): + response = await self.client.products.list_products( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_get_products(self, resource_group): + response = await self.client.products.get_products( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_get_product(self, resource_group): + response = await self.client.products.get_product( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_products_upload_log(self, resource_group): + response = await self.client.products.upload_log( + resource_group="str", + registration_name="str", + product_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations.py new file mode 100644 index 000000000000..c2e11206527f --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations.py @@ -0,0 +1,113 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementRegistrationsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_list(self, resource_group): + response = self.client.registrations.list( + resource_group="str", + api_version="2022-06-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_list_by_subscription(self, resource_group): + response = self.client.registrations.list_by_subscription( + api_version="2022-06-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_get(self, resource_group): + response = self.client.registrations.get( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_delete(self, resource_group): + response = self.client.registrations.delete( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_create_or_update(self, resource_group): + response = self.client.registrations.create_or_update( + resource_group="str", + registration_name="str", + token={"location": "str", "registrationToken": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_update(self, resource_group): + response = self.client.registrations.update( + resource_group="str", + registration_name="str", + token={"location": "str", "registrationToken": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_get_activation_key(self, resource_group): + response = self.client.registrations.get_activation_key( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_registrations_enable_remote_management(self, resource_group): + response = self.client.registrations.enable_remote_management( + resource_group="str", + registration_name="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations_async.py b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations_async.py new file mode 100644 index 000000000000..ee4a68133ffd --- /dev/null +++ b/sdk/azurestack/azure-mgmt-azurestack/generated_tests/test_azure_stack_management_registrations_operations_async.py @@ -0,0 +1,114 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.azurestack.aio import AzureStackManagementClient + +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer +from devtools_testutils.aio import recorded_by_proxy_async + +AZURE_LOCATION = "eastus" + + +@pytest.mark.skip("you may need to update the auto-generated test case before run it") +class TestAzureStackManagementRegistrationsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(AzureStackManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_list(self, resource_group): + response = self.client.registrations.list( + resource_group="str", + api_version="2022-06-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_list_by_subscription(self, resource_group): + response = self.client.registrations.list_by_subscription( + api_version="2022-06-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_get(self, resource_group): + response = await self.client.registrations.get( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_delete(self, resource_group): + response = await self.client.registrations.delete( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_create_or_update(self, resource_group): + response = await self.client.registrations.create_or_update( + resource_group="str", + registration_name="str", + token={"location": "str", "registrationToken": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_update(self, resource_group): + response = await self.client.registrations.update( + resource_group="str", + registration_name="str", + token={"location": "str", "registrationToken": "str"}, + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_get_activation_key(self, resource_group): + response = await self.client.registrations.get_activation_key( + resource_group="str", + registration_name="str", + api_version="2022-06-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_registrations_enable_remote_management(self, resource_group): + response = await self.client.registrations.enable_remote_management( + resource_group="str", + registration_name="str", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/azurestack/azure-mgmt-azurestack/sdk_packaging.toml b/sdk/azurestack/azure-mgmt-azurestack/sdk_packaging.toml index 900d3a9dbfa5..135fc20d20af 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/sdk_packaging.toml +++ b/sdk/azurestack/azure-mgmt-azurestack/sdk_packaging.toml @@ -2,5 +2,5 @@ package_name = "azure-mgmt-azurestack" package_pprint_name = "Azure Stack Management" package_doc_id = "" -is_stable = false +is_stable = true title = "AzureStackManagementClient" diff --git a/sdk/azurestack/azure-mgmt-azurestack/setup.py b/sdk/azurestack/azure-mgmt-azurestack/setup.py index 9ba62ffa91d9..b47e885927cd 100644 --- a/sdk/azurestack/azure-mgmt-azurestack/setup.py +++ b/sdk/azurestack/azure-mgmt-azurestack/setup.py @@ -1,10 +1,10 @@ #!/usr/bin/env python -#------------------------------------------------------------------------- +# ------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for # license information. -#-------------------------------------------------------------------------- +# -------------------------------------------------------------------------- import re import os.path @@ -16,64 +16,67 @@ PACKAGE_PPRINT_NAME = "Azure Stack Management" # a-b-c => a/b/c -package_folder_path = PACKAGE_NAME.replace('-', '/') +package_folder_path = PACKAGE_NAME.replace("-", "/") # a-b-c => a.b.c -namespace_name = PACKAGE_NAME.replace('-', '.') +namespace_name = PACKAGE_NAME.replace("-", ".") # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py') - if os.path.exists(os.path.join(package_folder_path, 'version.py')) - else os.path.join(package_folder_path, '_version.py'), 'r') as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', - fd.read(), re.MULTILINE).group(1) +with open( + os.path.join(package_folder_path, "version.py") + if os.path.exists(os.path.join(package_folder_path, "version.py")) + else os.path.join(package_folder_path, "_version.py"), + "r", +) as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) if not version: - raise RuntimeError('Cannot find version information') + raise RuntimeError("Cannot find version information") -with open('README.md', encoding='utf-8') as f: +with open("README.md", encoding="utf-8") as f: readme = f.read() -with open('CHANGELOG.md', encoding='utf-8') as f: +with open("CHANGELOG.md", encoding="utf-8") as f: changelog = f.read() setup( name=PACKAGE_NAME, version=version, - description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), - long_description=readme + '\n\n' + changelog, - long_description_content_type='text/markdown', - license='MIT License', - author='Microsoft Corporation', - author_email='azpysdkhelp@microsoft.com', - url='https://github.com/Azure/azure-sdk-for-python', + description="Microsoft Azure {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + long_description=readme + "\n\n" + changelog, + long_description_content_type="text/markdown", + license="MIT License", + author="Microsoft Corporation", + author_email="azpysdkhelp@microsoft.com", + url="https://github.com/Azure/azure-sdk-for-python", keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product classifiers=[ - 'Development Status :: 4 - Beta', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'License :: OSI Approved :: MIT License', + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "License :: OSI Approved :: MIT License", ], zip_safe=False, - packages=find_packages(exclude=[ - 'tests', - # Exclude packages that will be covered by PEP420 or nspkg - 'azure', - 'azure.mgmt', - ]), + packages=find_packages( + exclude=[ + "tests", + # Exclude packages that will be covered by PEP420 or nspkg + "azure", + "azure.mgmt", + ] + ), include_package_data=True, package_data={ - 'pytyped': ['py.typed'], + "pytyped": ["py.typed"], }, install_requires=[ - "msrest>=0.7.1", - "azure-common~=1.1", - "azure-mgmt-core>=1.3.2,<2.0.0", - "typing-extensions>=4.3.0; python_version<'3.8.0'", + "isodate>=0.6.1", + "typing-extensions>=4.6.0", + "azure-common>=1.1", + "azure-mgmt-core>=1.5.0", ], - python_requires=">=3.7" + python_requires=">=3.9", )