diff --git a/sdk/chaos/azure-mgmt-chaos/_meta.json b/sdk/chaos/azure-mgmt-chaos/_meta.json index a0a4ea6826a8..bb661d882f92 100644 --- a/sdk/chaos/azure-mgmt-chaos/_meta.json +++ b/sdk/chaos/azure-mgmt-chaos/_meta.json @@ -1,11 +1,11 @@ { - "commit": "50f502f5099796ba92f63384884574d46333cec2", + "commit": "5875a222c64c1bf977deff4d6e6dc57e62d87c40", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest": "3.9.7", + "autorest": "3.10.2", "use": [ - "@autorest/python@6.7.1", - "@autorest/modelerfour@4.26.2" + "@autorest/python@6.19.0", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/chaos/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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False", + "autorest_command": "autorest specification/chaos/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.19.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/chaos/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_chaos_management_client.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_chaos_management_client.py index f8d89f690015..b3a70c8ef2fe 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_chaos_management_client.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_chaos_management_client.py @@ -8,9 +8,12 @@ from copy import deepcopy from typing import Any, TYPE_CHECKING +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse from azure.mgmt.core import ARMPipelineClient +from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy from . import models as _models from ._configuration import ChaosManagementClientConfiguration @@ -39,22 +42,22 @@ class ChaosManagementClient: # pylint: disable=client-accepts-api-version-keywo :vartype capability_types: azure.mgmt.chaos.operations.CapabilityTypesOperations :ivar experiments: ExperimentsOperations operations :vartype experiments: azure.mgmt.chaos.operations.ExperimentsOperations - :ivar operation_statuses: OperationStatusesOperations operations - :vartype operation_statuses: azure.mgmt.chaos.operations.OperationStatusesOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.chaos.operations.Operations - :ivar target_types: TargetTypesOperations operations - :vartype target_types: azure.mgmt.chaos.operations.TargetTypesOperations + :ivar operation_statuses: OperationStatusesOperations operations + :vartype operation_statuses: azure.mgmt.chaos.operations.OperationStatusesOperations :ivar targets: TargetsOperations operations :vartype targets: azure.mgmt.chaos.operations.TargetsOperations + :ivar target_types: TargetTypesOperations operations + :vartype target_types: azure.mgmt.chaos.operations.TargetTypesOperations :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: GUID that represents an Azure subscription ID. Required. :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "2024-12-01-preview". Note that overriding + this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. @@ -70,7 +73,25 @@ def __init__( self._config = ChaosManagementClientConfiguration( credential=credential, subscription_id=subscription_id, **kwargs ) - self._client: ARMPipelineClient = 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=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) @@ -81,14 +102,14 @@ def __init__( self._client, self._config, self._serialize, self._deserialize ) self.experiments = ExperimentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) self.operation_statuses = OperationStatusesOperations( self._client, self._config, self._serialize, self._deserialize ) - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.target_types = TargetTypesOperations(self._client, self._config, self._serialize, self._deserialize) self.targets = TargetsOperations(self._client, self._config, self._serialize, self._deserialize) + self.target_types = TargetTypesOperations(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 @@ -108,12 +129,12 @@ 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) -> "ChaosManagementClient": + def __enter__(self) -> Self: self._client.__enter__() return self diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_configuration.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_configuration.py index e420c0f1ee9b..603ac4feaf7a 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_configuration.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_configuration.py @@ -8,7 +8,6 @@ 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 @@ -19,7 +18,7 @@ from azure.core.credentials import TokenCredential -class ChaosManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class ChaosManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for ChaosManagementClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +28,13 @@ class ChaosManagementClientConfiguration(Configuration): # pylint: disable=too- :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: GUID that represents an Azure subscription ID. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "2024-12-01-preview". Note that overriding + this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(ChaosManagementClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2024-01-01") + api_version: str = kwargs.pop("api_version", "2024-12-01-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -48,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-chaos/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: @@ -56,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/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_patch.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_patch.py index f99e77fef986..17dbc073e01b 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_patch.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_patch.py @@ -25,6 +25,7 @@ # # -------------------------------------------------------------------------- + # This file is used for handwritten extensions to the generated code. Example: # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md def patch_sdk(): diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_serialization.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_serialization.py index 4bae2292227b..8139854b97bb 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_serialization.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_serialization.py @@ -63,8 +63,8 @@ import isodate # type: ignore -from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback -from azure.core.serialization import NULL as AzureCoreNull +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") @@ -124,7 +124,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 @@ -143,7 +143,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 @@ -170,13 +172,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: @@ -295,7 +290,7 @@ class Model(object): _validation: Dict[str, Dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Dict[str, Any] = {} + self.additional_properties: Optional[Dict[str, Any]] = {} for k in kwargs: 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__) @@ -340,7 +335,7 @@ 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: bool = False, **kwargs: Any) -> JSON: - """Return the JSON that would be sent to azure from this model. + """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)`. @@ -351,7 +346,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) # type: ignore def as_dict( self, @@ -390,7 +385,7 @@ def my_key_transformer(key, attr_desc, value): :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs) # type: ignore @classmethod def _infer_class_models(cls): @@ -415,7 +410,7 @@ def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = N :raises: DeserializationError if something went wrong """ 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( @@ -445,7 +440,7 @@ def from_dict( 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): @@ -545,7 +540,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -561,7 +556,7 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, Type[ModelType]] = 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 @@ -649,7 +644,7 @@ 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 @@ -668,7 +663,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): 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) + raise SerializationError(msg) from err else: return serialized @@ -710,7 +705,7 @@ def body(self, data, data_type, **kwargs): ] data = deserializer._deserialize(data_type, data) 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) @@ -730,6 +725,7 @@ 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: @@ -744,7 +740,7 @@ def query(self, name, data, data_type, **kwargs): :param str data_type: The type to be serialized from. :keyword bool skip_quote: Whether to skip quote the serialized result. Defaults to False. - :rtype: str + :rtype: str, list :raises: TypeError if serialization fails. :raises: ValueError if data is None """ @@ -753,7 +749,7 @@ def query(self, name, data, data_type, **kwargs): if data_type.startswith("["): internal_data_type = data_type[1:-1] do_quote = not kwargs.get("skip_quote", False) - return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)) + 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) @@ -804,7 +800,7 @@ def serialize_data(self, data, data_type, **kwargs): raise ValueError("No value for given attribute") try: - if data is AzureCoreNull: + if data is CoreNull: return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) @@ -824,7 +820,7 @@ 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) + raise SerializationError(msg.format(data, data_type)) from err else: return self._serialize(data, **kwargs) @@ -993,7 +989,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) @@ -1170,10 +1166,10 @@ 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): @@ -1209,7 +1205,6 @@ 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:]) @@ -1230,7 +1225,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:]) @@ -1371,7 +1365,7 @@ class Deserializer(object): 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}]?") - def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1391,7 +1385,7 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, Type[ModelType]] = 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 @@ -1444,12 +1438,12 @@ 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): 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 @@ -1481,7 +1475,7 @@ 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) + raise DeserializationError(msg) from err else: additional_properties = self._build_additional_properties(attributes, data) return self._instantiate_model(response, d_attrs, additional_properties) @@ -1515,14 +1509,14 @@ def _classify_target(self, target, data): 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 except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1578,7 +1572,7 @@ 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 @@ -1652,7 +1646,7 @@ 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) + raise DeserializationError(msg) from err else: return self._deserialize(obj_type, data) @@ -1700,7 +1694,7 @@ def deserialize_object(self, attr, **kwargs): 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: @@ -1757,7 +1751,7 @@ def deserialize_basic(self, attr, data_type): if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, basestring): + elif isinstance(attr, str): if attr.lower() in ["true", "1"]: return True elif attr.lower() in ["false", "0"]: @@ -1808,7 +1802,6 @@ 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: @@ -1862,10 +1855,10 @@ def deserialize_decimal(attr): 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): @@ -1893,7 +1886,7 @@ 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) + raise DeserializationError(msg) from err else: return duration @@ -1910,7 +1903,7 @@ def deserialize_date(attr): 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): @@ -1945,7 +1938,7 @@ def deserialize_rfc(attr): 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) + raise DeserializationError(msg) from err else: return date_obj @@ -1982,7 +1975,7 @@ 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) + raise DeserializationError(msg) from err else: return date_obj @@ -1998,9 +1991,10 @@ def deserialize_unix(attr): 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) + raise DeserializationError(msg) from err else: return date_obj diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_vendor.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_vendor.py deleted file mode 100644 index 0dafe0e287ff..000000000000 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_vendor.py +++ /dev/null @@ -1,16 +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 diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_version.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_version.py index 59deb8c7263b..9cf33092d41b 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_version.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.0" +VERSION = "1.0.0b5" diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_chaos_management_client.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_chaos_management_client.py index 8e19c73cecc9..ca10f7325523 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_chaos_management_client.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_chaos_management_client.py @@ -8,9 +8,12 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient +from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy from .. import models as _models from .._serialization import Deserializer, Serializer @@ -39,22 +42,22 @@ class ChaosManagementClient: # pylint: disable=client-accepts-api-version-keywo :vartype capability_types: azure.mgmt.chaos.aio.operations.CapabilityTypesOperations :ivar experiments: ExperimentsOperations operations :vartype experiments: azure.mgmt.chaos.aio.operations.ExperimentsOperations - :ivar operation_statuses: OperationStatusesOperations operations - :vartype operation_statuses: azure.mgmt.chaos.aio.operations.OperationStatusesOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.chaos.aio.operations.Operations - :ivar target_types: TargetTypesOperations operations - :vartype target_types: azure.mgmt.chaos.aio.operations.TargetTypesOperations + :ivar operation_statuses: OperationStatusesOperations operations + :vartype operation_statuses: azure.mgmt.chaos.aio.operations.OperationStatusesOperations :ivar targets: TargetsOperations operations :vartype targets: azure.mgmt.chaos.aio.operations.TargetsOperations + :ivar target_types: TargetTypesOperations operations + :vartype target_types: azure.mgmt.chaos.aio.operations.TargetTypesOperations :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: GUID that represents an Azure subscription ID. Required. :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "2024-12-01-preview". Note that overriding + this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. @@ -70,7 +73,25 @@ def __init__( self._config = ChaosManagementClientConfiguration( credential=credential, subscription_id=subscription_id, **kwargs ) - self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(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), + 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=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) @@ -81,14 +102,16 @@ def __init__( self._client, self._config, self._serialize, self._deserialize ) self.experiments = ExperimentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) self.operation_statuses = OperationStatusesOperations( self._client, self._config, self._serialize, self._deserialize ) - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.target_types = TargetTypesOperations(self._client, self._config, self._serialize, self._deserialize) self.targets = TargetsOperations(self._client, self._config, self._serialize, self._deserialize) + self.target_types = TargetTypesOperations(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 @@ -108,12 +131,12 @@ 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) -> "ChaosManagementClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_configuration.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_configuration.py index 137f3ae177da..fdc98bdea8cb 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_configuration.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_configuration.py @@ -8,7 +8,6 @@ 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 @@ -19,7 +18,7 @@ from azure.core.credentials_async import AsyncTokenCredential -class ChaosManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class ChaosManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for ChaosManagementClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +28,13 @@ class ChaosManagementClientConfiguration(Configuration): # pylint: disable=too- :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: GUID that represents an Azure subscription ID. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this - default value may result in unsupported behavior. + :keyword api_version: Api Version. Default value is "2024-12-01-preview". Note that overriding + this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(ChaosManagementClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2024-01-01") + api_version: str = kwargs.pop("api_version", "2024-12-01-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -48,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-chaos/{}".format(VERSION)) + self.polling_interval = kwargs.get("polling_interval", 30) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: @@ -56,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/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_patch.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_patch.py index f99e77fef986..17dbc073e01b 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_patch.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/_patch.py @@ -25,6 +25,7 @@ # # -------------------------------------------------------------------------- + # This file is used for handwritten extensions to the generated code. Example: # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md def patch_sdk(): diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/__init__.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/__init__.py index 531fb369a6b5..90cd0f276024 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/__init__.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/__init__.py @@ -9,10 +9,10 @@ from ._capabilities_operations import CapabilitiesOperations from ._capability_types_operations import CapabilityTypesOperations from ._experiments_operations import ExperimentsOperations -from ._operation_statuses_operations import OperationStatusesOperations from ._operations import Operations -from ._target_types_operations import TargetTypesOperations +from ._operation_statuses_operations import OperationStatusesOperations from ._targets_operations import TargetsOperations +from ._target_types_operations import TargetTypesOperations from ._patch import __all__ as _patch_all from ._patch import * # pylint: disable=unused-wildcard-import @@ -22,10 +22,10 @@ "CapabilitiesOperations", "CapabilityTypesOperations", "ExperimentsOperations", - "OperationStatusesOperations", "Operations", - "TargetTypesOperations", + "OperationStatusesOperations", "TargetsOperations", + "TargetTypesOperations", ] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capabilities_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capabilities_operations.py index 4ac44e8e2a0a..1ddfb8d7d184 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capabilities_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capabilities_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload +import sys +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -20,15 +21,13 @@ 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 ...operations._capabilities_operations import ( build_create_or_update_request, build_delete_request, @@ -36,6 +35,10 @@ build_list_request, ) +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -86,7 +89,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Capability or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.Capability] :raises ~azure.core.exceptions.HttpResponseError: @@ -97,7 +99,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -108,7 +110,7 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -117,12 +119,10 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -134,13 +134,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("CapabilityListResult", pipeline_response) @@ -150,11 +149,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -167,10 +166,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities" - } - @distributed_trace_async async def get( self, @@ -197,12 +192,11 @@ async def get( :type target_name: str :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -216,7 +210,7 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Capability] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -225,16 +219,14 @@ async def get( capability_name=capability_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -244,16 +236,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("Capability", pipeline_response) + deserialized = self._deserialize("Capability", 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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return deserialized # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements @@ -281,12 +269,11 @@ async def delete( # pylint: disable=inconsistent-return-statements :type target_name: str :param capability_name: String that represents a Capability resource name. Required. :type capability_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[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -300,7 +287,7 @@ async def delete( # pylint: disable=inconsistent-return-statements 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_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -309,16 +296,14 @@ async def delete( # pylint: disable=inconsistent-return-statements capability_name=capability_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -329,11 +314,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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload async def create_or_update( @@ -369,7 +350,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: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: @@ -384,7 +364,7 @@ async def create_or_update( parent_resource_name: str, target_name: str, capability_name: str, - capability: IO, + capability: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -405,11 +385,10 @@ async def create_or_update( :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str :param capability: Capability resource to be created or updated. Required. - :type capability: IO + :type capability: 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: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: @@ -424,7 +403,7 @@ async def create_or_update( parent_resource_name: str, target_name: str, capability_name: str, - capability: Union[_models.Capability, IO], + capability: Union[_models.Capability, IO[bytes]], **kwargs: Any ) -> _models.Capability: """Create or update a Capability resource that extends a Target resource. @@ -443,17 +422,13 @@ async def create_or_update( :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str :param capability: Capability resource to be created or updated. Is either a Capability type or - a IO type. Required. - :type capability: ~azure.mgmt.chaos.models.Capability 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 + a IO[bytes] type. Required. + :type capability: ~azure.mgmt.chaos.models.Capability or IO[bytes] :return: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -476,7 +451,7 @@ async def create_or_update( else: _json = self._serialize.body(capability, "Capability") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -488,16 +463,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -507,13 +480,9 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Capability", pipeline_response) + deserialized = self._deserialize("Capability", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capability_types_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capability_types_operations.py index 1a47b0f8e4e5..88f1215f57e7 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capability_types_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_capability_types_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +import sys +from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -19,17 +20,19 @@ 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 ...operations._capability_types_operations import build_get_request, build_list_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -70,7 +73,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CapabilityType or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.CapabilityType] :raises ~azure.core.exceptions.HttpResponseError: @@ -81,7 +83,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityTypeListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -92,18 +94,16 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( location_name=location_name, target_type_name=target_type_name, subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -115,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("CapabilityTypeListResult", pipeline_response) @@ -131,11 +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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -148,10 +147,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}/capabilityTypes" - } - @distributed_trace_async async def get( self, location_name: str, target_type_name: str, capability_type_name: str, **kwargs: Any @@ -164,12 +159,11 @@ async def get( :type target_type_name: str :param capability_type_name: String that represents a Capability Type resource name. Required. :type capability_type_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CapabilityType or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.CapabilityType :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -183,22 +177,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityType] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location_name=location_name, target_type_name=target_type_name, capability_type_name=capability_type_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -208,13 +200,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("CapabilityType", pipeline_response) + deserialized = self._deserialize("CapabilityType", 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}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}/capabilityTypes/{capabilityTypeName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_experiments_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_experiments_operations.py index e8f2c44f2541..644c43771053 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_experiments_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_experiments_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -17,12 +18,13 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod -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 @@ -30,7 +32,6 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._experiments_operations import ( build_cancel_request, build_create_or_update_request, @@ -45,6 +46,10 @@ build_update_request, ) +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -81,7 +86,6 @@ def list_all( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Experiment or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -92,7 +96,7 @@ def list_all( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -103,17 +107,15 @@ def list_all( def prepare_request(next_link=None): if not next_link: - request = build_list_all_request( + _request = build_list_all_request( subscription_id=self._config.subscription_id, running=running, continuation_token_parameter=continuation_token_parameter, api_version=api_version, - template_url=self.list_all.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 @@ -125,13 +127,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("ExperimentListResult", pipeline_response) @@ -141,11 +142,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -158,8 +159,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_all.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/experiments"} - @distributed_trace def list( self, @@ -179,7 +178,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Experiment or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -190,7 +188,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -201,18 +199,16 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, subscription_id=self._config.subscription_id, running=running, continuation_token_parameter=continuation_token_parameter, 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 @@ -224,13 +220,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("ExperimentListResult", pipeline_response) @@ -240,11 +235,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -257,14 +252,10 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments" - } - - async def _delete_initial( # pylint: disable=inconsistent-return-statements + async def _delete_initial( self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -276,38 +267,41 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> AsyncLROPoller[None]: @@ -317,14 +311,6 @@ async def begin_delete(self, resource_group_name: str, experiment_name: str, **k :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -338,7 +324,7 @@ async def begin_delete(self, resource_group_name: str, experiment_name: str, **k lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._delete_initial( # type: ignore + raw_result = await self._delete_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -347,11 +333,12 @@ async def begin_delete(self, resource_group_name: str, experiment_name: str, **k params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: AsyncPollingMethod = cast( @@ -362,17 +349,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace_async async def get(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> _models.Experiment: @@ -382,12 +365,11 @@ async def get(self, resource_group_name: str, experiment_name: str, **kwargs: An :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Experiment or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Experiment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -401,21 +383,19 @@ async def get(self, resource_group_name: str, experiment_name: str, **kwargs: An api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Experiment] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, experiment_name=experiment_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -425,21 +405,21 @@ async def get(self, resource_group_name: str, experiment_name: str, **kwargs: An error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", 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/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore async def _create_or_update_initial( - self, resource_group_name: str, experiment_name: str, experiment: Union[_models.Experiment, IO], **kwargs: Any - ) -> _models.Experiment: - error_map = { + self, + resource_group_name: str, + experiment_name: str, + experiment: Union[_models.Experiment, IO[bytes]], + **kwargs: Any + ) -> AsyncIterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -452,7 +432,7 @@ async def _create_or_update_initial( 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.Experiment] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -462,7 +442,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(experiment, "Experiment") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, @@ -470,40 +450,35 @@ async def _create_or_update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_or_update_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) 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("Experiment", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } - @overload async def begin_create_or_update( self, @@ -525,14 +500,6 @@ async def begin_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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -544,7 +511,7 @@ async def begin_create_or_update( self, resource_group_name: str, experiment_name: str, - experiment: IO, + experiment: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -556,18 +523,10 @@ async def begin_create_or_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Experiment resource to be created or updated. Required. - :type experiment: IO + :type experiment: 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -576,7 +535,11 @@ async def begin_create_or_update( @distributed_trace_async async def begin_create_or_update( - self, resource_group_name: str, experiment_name: str, experiment: Union[_models.Experiment, IO], **kwargs: Any + self, + resource_group_name: str, + experiment_name: str, + experiment: Union[_models.Experiment, IO[bytes]], + **kwargs: Any ) -> AsyncLROPoller[_models.Experiment]: """Create or update a Experiment resource. @@ -585,19 +548,8 @@ async def begin_create_or_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Experiment resource to be created or updated. Is either a Experiment type or - a IO type. Required. - :type experiment: ~azure.mgmt.chaos.models.Experiment 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + a IO[bytes] type. Required. + :type experiment: ~azure.mgmt.chaos.models.Experiment or IO[bytes] :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -624,12 +576,13 @@ async def begin_create_or_update( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -642,26 +595,24 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.Experiment].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return AsyncLROPoller[_models.Experiment]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) async def _update_initial( self, resource_group_name: str, experiment_name: str, - experiment: Union[_models.ExperimentUpdate, IO], + experiment: Union[_models.ExperimentUpdate, IO[bytes]], **kwargs: Any - ) -> _models.Experiment: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -674,7 +625,7 @@ async def _update_initial( 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.Experiment] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -684,7 +635,7 @@ async def _update_initial( else: _json = self._serialize.body(experiment, "ExperimentUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, @@ -692,35 +643,34 @@ async def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore @overload async def begin_update( @@ -743,14 +693,6 @@ async def begin_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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -762,7 +704,7 @@ async def begin_update( self, resource_group_name: str, experiment_name: str, - experiment: IO, + experiment: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -774,18 +716,10 @@ async def begin_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Parameters supplied to the Update experiment operation. Required. - :type experiment: IO + :type experiment: 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -797,7 +731,7 @@ async def begin_update( self, resource_group_name: str, experiment_name: str, - experiment: Union[_models.ExperimentUpdate, IO], + experiment: Union[_models.ExperimentUpdate, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.Experiment]: """The operation to update an experiment. @@ -807,19 +741,8 @@ async def begin_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Parameters supplied to the Update experiment operation. Is either a - ExperimentUpdate type or a IO type. Required. - :type experiment: ~azure.mgmt.chaos.models.ExperimentUpdate 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + ExperimentUpdate type or a IO[bytes] type. Required. + :type experiment: ~azure.mgmt.chaos.models.ExperimentUpdate or IO[bytes] :return: An instance of AsyncLROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.chaos.models.Experiment] @@ -846,12 +769,13 @@ async def begin_update( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -863,22 +787,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.Experiment].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return AsyncLROPoller[_models.Experiment]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - async def _cancel_initial( # pylint: disable=inconsistent-return-statements + async def _cancel_initial( self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -890,38 +812,41 @@ async def _cancel_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) - request = build_cancel_request( + _request = build_cancel_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._cancel_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _cancel_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/cancel" - } + return deserialized # type: ignore @distributed_trace_async async def begin_cancel(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> AsyncLROPoller[None]: @@ -931,14 +856,6 @@ async def begin_cancel(self, resource_group_name: str, experiment_name: str, **k :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -952,7 +869,7 @@ async def begin_cancel(self, resource_group_name: str, experiment_name: str, **k lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._cancel_initial( # type: ignore + raw_result = await self._cancel_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -961,11 +878,12 @@ async def begin_cancel(self, resource_group_name: str, experiment_name: str, **k params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: AsyncPollingMethod = cast( @@ -976,22 +894,18 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_cancel.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/cancel" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore - async def _start_initial( # pylint: disable=inconsistent-return-statements + async def _start_initial( self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1003,38 +917,41 @@ async def _start_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) - request = build_start_request( + _request = build_start_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._start_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _start_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/start" - } + return deserialized # type: ignore @distributed_trace_async async def begin_start(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> AsyncLROPoller[None]: @@ -1044,14 +961,6 @@ async def begin_start(self, resource_group_name: str, experiment_name: str, **kw :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -1065,7 +974,7 @@ async def begin_start(self, resource_group_name: str, experiment_name: str, **kw lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._start_initial( # type: ignore + raw_result = await self._start_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -1074,11 +983,12 @@ async def begin_start(self, resource_group_name: str, experiment_name: str, **kw params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: AsyncPollingMethod = cast( @@ -1089,17 +999,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_start.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/start" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list_all_executions( @@ -1111,7 +1017,6 @@ def list_all_executions( :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ExperimentExecution or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.ExperimentExecution] :raises ~azure.core.exceptions.HttpResponseError: @@ -1122,7 +1027,7 @@ def list_all_executions( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecutionListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1133,17 +1038,15 @@ def list_all_executions( def prepare_request(next_link=None): if not next_link: - request = build_list_all_executions_request( + _request = build_list_all_executions_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_all_executions.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 @@ -1155,13 +1058,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("ExperimentExecutionListResult", pipeline_response) @@ -1171,11 +1073,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1188,10 +1090,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_all_executions.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions" - } - @distributed_trace_async async def get_execution( self, resource_group_name: str, experiment_name: str, execution_id: str, **kwargs: Any @@ -1204,12 +1102,11 @@ async def get_execution( :type experiment_name: str :param execution_id: GUID that represents a Experiment execution detail. Required. :type execution_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExperimentExecution or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.ExperimentExecution :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1223,22 +1120,20 @@ async def get_execution( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecution] = kwargs.pop("cls", None) - request = build_get_execution_request( + _request = build_get_execution_request( resource_group_name=resource_group_name, experiment_name=experiment_name, execution_id=execution_id, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_execution.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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1248,16 +1143,12 @@ async def get_execution( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExperimentExecution", pipeline_response) + deserialized = self._deserialize("ExperimentExecution", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_execution.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions/{executionId}" - } + return deserialized # type: ignore @distributed_trace_async async def execution_details( @@ -1271,12 +1162,11 @@ async def execution_details( :type experiment_name: str :param execution_id: GUID that represents a Experiment execution detail. Required. :type execution_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExperimentExecutionDetails or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.ExperimentExecutionDetails :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1290,22 +1180,20 @@ async def execution_details( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecutionDetails] = kwargs.pop("cls", None) - request = build_execution_details_request( + _request = build_execution_details_request( resource_group_name=resource_group_name, experiment_name=experiment_name, execution_id=execution_id, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.execution_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1315,13 +1203,9 @@ async def execution_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExperimentExecutionDetails", pipeline_response) + deserialized = self._deserialize("ExperimentExecutionDetails", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - execution_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions/{executionId}/getExecutionDetails" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operation_statuses_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operation_statuses_operations.py index e66c7b222bb1..cd7a9aa266d0 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operation_statuses_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operation_statuses_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar +import sys +from typing import Any, Callable, Dict, Optional, Type, TypeVar from azure.core.exceptions import ( ClientAuthenticationError, @@ -17,16 +18,18 @@ 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 ...operations._operation_statuses_operations import build_get_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -58,12 +61,11 @@ async def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _m :type location: str :param async_operation_id: The operation Id. Required. :type async_operation_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: OperationStatus or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.OperationStatus :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -77,21 +79,19 @@ async def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _m api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationStatus] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location=location, async_operation_id=async_operation_id, 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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -101,13 +101,9 @@ async def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _m error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("OperationStatus", pipeline_response) + deserialized = self._deserialize("OperationStatus", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{location}/operationStatuses/{asyncOperationId}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operations.py index 43c0057dce22..555b390f8eae 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +import sys +from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -19,16 +20,18 @@ 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 ...operations._operations import build_list_all_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,7 +59,6 @@ def __init__(self, *args, **kwargs) -> None: def list_all(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: """Get a list all available 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.chaos.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -67,7 +69,7 @@ def list_all(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -78,14 +80,12 @@ def list_all(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_all_request( + _request = build_list_all_request( api_version=api_version, - template_url=self.list_all.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 @@ -97,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("OperationListResult", pipeline_response) @@ -113,11 +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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -129,5 +128,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list_all.metadata = {"url": "/providers/Microsoft.Chaos/operations"} diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_target_types_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_target_types_operations.py index c518a3f6cf31..7a6b4fac3f68 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_target_types_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_target_types_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +import sys +from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -19,17 +20,19 @@ 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 ...operations._target_types_operations import build_get_request, build_list_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -64,7 +67,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TargetType or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.TargetType] :raises ~azure.core.exceptions.HttpResponseError: @@ -75,7 +77,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetTypeListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -86,17 +88,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( location_name=location_name, subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -108,13 +108,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("TargetTypeListResult", pipeline_response) @@ -124,11 +123,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -141,10 +140,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes" - } - @distributed_trace_async async def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> _models.TargetType: """Get a Target Type resources for given location. @@ -153,12 +148,11 @@ async def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> :type location_name: str :param target_type_name: String that represents a Target Type resource name. Required. :type target_type_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TargetType or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.TargetType :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -172,21 +166,19 @@ async def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetType] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location_name=location_name, target_type_name=target_type_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -196,13 +188,9 @@ async def get(self, location_name: str, target_type_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("TargetType", pipeline_response) + deserialized = self._deserialize("TargetType", 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}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_targets_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_targets_operations.py index a33444b57258..874ba748b009 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_targets_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/aio/operations/_targets_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload +import sys +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -20,15 +21,13 @@ 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 ...operations._targets_operations import ( build_create_or_update_request, build_delete_request, @@ -36,6 +35,10 @@ build_list_request, ) +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,7 +86,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Target or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.chaos.models.Target] :raises ~azure.core.exceptions.HttpResponseError: @@ -94,7 +96,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -105,7 +107,7 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -113,12 +115,10 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -130,13 +130,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("TargetListResult", pipeline_response) @@ -146,11 +145,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -163,10 +162,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets" - } - @distributed_trace_async async def get( self, @@ -190,12 +185,11 @@ async def get( :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -209,7 +203,7 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Target] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -217,16 +211,14 @@ async def get( target_name=target_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -236,16 +228,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("Target", pipeline_response) + deserialized = self._deserialize("Target", 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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return deserialized # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements @@ -270,12 +258,11 @@ async def delete( # pylint: disable=inconsistent-return-statements :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_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[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -289,7 +276,7 @@ async def delete( # pylint: disable=inconsistent-return-statements 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_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -297,16 +284,14 @@ async def delete( # pylint: disable=inconsistent-return-statements target_name=target_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -317,11 +302,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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload async def create_or_update( @@ -354,7 +335,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: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: @@ -368,7 +348,7 @@ async def create_or_update( parent_resource_type: str, parent_resource_name: str, target_name: str, - target: IO, + target: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -387,11 +367,10 @@ async def create_or_update( :param target_name: String that represents a Target resource name. Required. :type target_name: str :param target: Target resource to be created or updated. Required. - :type target: IO + :type target: 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: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: @@ -405,7 +384,7 @@ async def create_or_update( parent_resource_type: str, parent_resource_name: str, target_name: str, - target: Union[_models.Target, IO], + target: Union[_models.Target, IO[bytes]], **kwargs: Any ) -> _models.Target: """Create or update a Target resource that extends a tracked regional resource. @@ -421,18 +400,14 @@ async def create_or_update( :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_name: str - :param target: Target resource to be created or updated. Is either a Target type or a IO type. - Required. - :type target: ~azure.mgmt.chaos.models.Target 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 target: Target resource to be created or updated. Is either a Target type or a IO[bytes] + type. Required. + :type target: ~azure.mgmt.chaos.models.Target or IO[bytes] :return: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -455,7 +430,7 @@ async def create_or_update( else: _json = self._serialize.body(target, "Target") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -466,16 +441,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -485,13 +458,9 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Target", pipeline_response) + deserialized = self._deserialize("Target", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/__init__.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/__init__.py index 9a96863d5947..19fe43fc6056 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/__init__.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/__init__.py @@ -6,22 +6,15 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from ._models_py3 import Action from ._models_py3 import ActionStatus +from ._models_py3 import Branch from ._models_py3 import BranchStatus from ._models_py3 import Capability from ._models_py3 import CapabilityListResult from ._models_py3 import CapabilityType from ._models_py3 import CapabilityTypeListResult from ._models_py3 import CapabilityTypePropertiesRuntimeProperties -from ._models_py3 import ChaosExperimentAction -from ._models_py3 import ChaosExperimentBranch -from ._models_py3 import ChaosExperimentStep -from ._models_py3 import ChaosTargetFilter -from ._models_py3 import ChaosTargetListSelector -from ._models_py3 import ChaosTargetQuerySelector -from ._models_py3 import ChaosTargetSelector -from ._models_py3 import ChaosTargetSimpleFilter -from ._models_py3 import ChaosTargetSimpleFilterParameters from ._models_py3 import ContinuousAction from ._models_py3 import DelayAction from ._models_py3 import DiscreteAction @@ -39,13 +32,20 @@ from ._models_py3 import ExperimentExecutionProperties from ._models_py3 import ExperimentListResult from ._models_py3 import ExperimentUpdate +from ._models_py3 import Filter from ._models_py3 import KeyValuePair +from ._models_py3 import ListSelector from ._models_py3 import Operation from ._models_py3 import OperationDisplay from ._models_py3 import OperationListResult from ._models_py3 import OperationStatus +from ._models_py3 import QuerySelector from ._models_py3 import Resource from ._models_py3 import ResourceIdentity +from ._models_py3 import Selector +from ._models_py3 import SimpleFilter +from ._models_py3 import SimpleFilterParameters +from ._models_py3 import Step from ._models_py3 import StepStatus from ._models_py3 import SystemData from ._models_py3 import Target @@ -69,22 +69,15 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ + "Action", "ActionStatus", + "Branch", "BranchStatus", "Capability", "CapabilityListResult", "CapabilityType", "CapabilityTypeListResult", "CapabilityTypePropertiesRuntimeProperties", - "ChaosExperimentAction", - "ChaosExperimentBranch", - "ChaosExperimentStep", - "ChaosTargetFilter", - "ChaosTargetListSelector", - "ChaosTargetQuerySelector", - "ChaosTargetSelector", - "ChaosTargetSimpleFilter", - "ChaosTargetSimpleFilterParameters", "ContinuousAction", "DelayAction", "DiscreteAction", @@ -102,13 +95,20 @@ "ExperimentExecutionProperties", "ExperimentListResult", "ExperimentUpdate", + "Filter", "KeyValuePair", + "ListSelector", "Operation", "OperationDisplay", "OperationListResult", "OperationStatus", + "QuerySelector", "Resource", "ResourceIdentity", + "Selector", + "SimpleFilter", + "SimpleFilterParameters", + "Step", "StepStatus", "SystemData", "Target", diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/_models_py3.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/_models_py3.py index 08adccb821aa..1848253c695b 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/_models_py3.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/models/_models_py3.py @@ -17,6 +17,42 @@ from .. import models as _models +class Action(_serialization.Model): + """Model that represents the base action model. 9 total per experiment. + + You probably want to use the sub-classes and not this class directly. Known sub-classes are: + ContinuousAction, DelayAction, DiscreteAction + + All required parameters must be populated in order to send to server. + + :ivar type: Enum that discriminates between action models. Required. + :vartype type: str + :ivar name: String that represents a Capability URN. Required. + :vartype name: str + """ + + _validation = { + "type": {"required": True}, + "name": {"required": True, "max_length": 2048}, + } + + _attribute_map = { + "type": {"key": "type", "type": "str"}, + "name": {"key": "name", "type": "str"}, + } + + _subtype_map = {"type": {"continuous": "ContinuousAction", "delay": "DelayAction", "discrete": "DiscreteAction"}} + + def __init__(self, *, name: str, **kwargs: Any) -> None: + """ + :keyword name: String that represents a Capability URN. Required. + :paramtype name: str + """ + super().__init__(**kwargs) + self.type: Optional[str] = None + self.name = name + + class ActionStatus(_serialization.Model): """Model that represents the an action and its status. @@ -66,6 +102,39 @@ def __init__(self, **kwargs: Any) -> None: self.targets = None +class Branch(_serialization.Model): + """Model that represents a branch in the step. 9 total per experiment. + + All required parameters must be populated in order to send to server. + + :ivar name: String of the branch name. Required. + :vartype name: str + :ivar actions: List of actions. Required. + :vartype actions: list[~azure.mgmt.chaos.models.Action] + """ + + _validation = { + "name": {"required": True, "min_length": 1}, + "actions": {"required": True, "max_items": 9, "min_items": 1}, + } + + _attribute_map = { + "name": {"key": "name", "type": "str"}, + "actions": {"key": "actions", "type": "[Action]"}, + } + + def __init__(self, *, name: str, actions: List["_models.Action"], **kwargs: Any) -> None: + """ + :keyword name: String of the branch name. Required. + :paramtype name: str + :keyword actions: List of actions. Required. + :paramtype actions: list[~azure.mgmt.chaos.models.Action] + """ + super().__init__(**kwargs) + self.name = name + self.actions = actions + + class BranchStatus(_serialization.Model): """Model that represents the a list of actions and action statuses. @@ -110,7 +179,7 @@ class Resource(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -145,7 +214,7 @@ class Capability(Resource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -235,7 +304,7 @@ class CapabilityType(Resource): # pylint: disable=too-many-instance-attributes Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -366,7 +435,7 @@ def __init__(self, **kwargs: Any) -> None: self.next_link = None -class CapabilityTypePropertiesRuntimeProperties(_serialization.Model): +class CapabilityTypePropertiesRuntimeProperties(_serialization.Model): # pylint: disable=name-too-long """Runtime properties of this Capability Type. Variables are only populated by the server, and will be ignored when sending a request. @@ -389,586 +458,215 @@ def __init__(self, **kwargs: Any) -> None: self.kind = None -class ChaosExperimentAction(_serialization.Model): - """Model that represents the base action model. 9 total per experiment. - - You probably want to use the sub-classes and not this class directly. Known sub-classes are: - ContinuousAction, DelayAction, DiscreteAction +class ContinuousAction(Action): + """Model that represents a continuous action. - 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 type: Enum that discriminates between action models. Required. :vartype type: str :ivar name: String that represents a Capability URN. Required. :vartype name: str + :ivar duration: ISO8601 formatted string that represents a duration. Required. + :vartype duration: ~datetime.timedelta + :ivar parameters: List of key value pairs. Required. + :vartype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] + :ivar selector_id: String that represents a selector. Required. + :vartype selector_id: str """ _validation = { "type": {"required": True}, "name": {"required": True, "max_length": 2048}, + "duration": {"required": True}, + "parameters": {"required": True}, + "selector_id": {"required": True, "min_length": 1}, } _attribute_map = { "type": {"key": "type", "type": "str"}, "name": {"key": "name", "type": "str"}, + "duration": {"key": "duration", "type": "duration"}, + "parameters": {"key": "parameters", "type": "[KeyValuePair]"}, + "selector_id": {"key": "selectorId", "type": "str"}, } - _subtype_map = {"type": {"continuous": "ContinuousAction", "delay": "DelayAction", "discrete": "DiscreteAction"}} - - def __init__(self, *, name: str, **kwargs: Any) -> None: + def __init__( + self, + *, + name: str, + duration: datetime.timedelta, + parameters: List["_models.KeyValuePair"], + selector_id: str, + **kwargs: Any + ) -> None: """ :keyword name: String that represents a Capability URN. Required. :paramtype name: str + :keyword duration: ISO8601 formatted string that represents a duration. Required. + :paramtype duration: ~datetime.timedelta + :keyword parameters: List of key value pairs. Required. + :paramtype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] + :keyword selector_id: String that represents a selector. Required. + :paramtype selector_id: str """ - super().__init__(**kwargs) - self.type: Optional[str] = None - self.name = name + super().__init__(name=name, **kwargs) + self.type: str = "continuous" + self.duration = duration + self.parameters = parameters + self.selector_id = selector_id -class ChaosExperimentBranch(_serialization.Model): - """Model that represents a branch in the step. 9 total per experiment. +class DelayAction(Action): + """Model that represents a delay action. - 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 name: String of the branch name. Required. + :ivar type: Enum that discriminates between action models. Required. + :vartype type: str + :ivar name: String that represents a Capability URN. Required. :vartype name: str - :ivar actions: List of actions. Required. - :vartype actions: list[~azure.mgmt.chaos.models.ChaosExperimentAction] + :ivar duration: ISO8601 formatted string that represents a duration. Required. + :vartype duration: ~datetime.timedelta """ _validation = { - "name": {"required": True, "min_length": 1}, - "actions": {"required": True, "max_items": 9, "min_items": 1}, + "type": {"required": True}, + "name": {"required": True, "max_length": 2048}, + "duration": {"required": True}, } _attribute_map = { + "type": {"key": "type", "type": "str"}, "name": {"key": "name", "type": "str"}, - "actions": {"key": "actions", "type": "[ChaosExperimentAction]"}, + "duration": {"key": "duration", "type": "duration"}, } - def __init__(self, *, name: str, actions: List["_models.ChaosExperimentAction"], **kwargs: Any) -> None: + def __init__(self, *, name: str, duration: datetime.timedelta, **kwargs: Any) -> None: """ - :keyword name: String of the branch name. Required. + :keyword name: String that represents a Capability URN. Required. :paramtype name: str - :keyword actions: List of actions. Required. - :paramtype actions: list[~azure.mgmt.chaos.models.ChaosExperimentAction] + :keyword duration: ISO8601 formatted string that represents a duration. Required. + :paramtype duration: ~datetime.timedelta """ - super().__init__(**kwargs) - self.name = name - self.actions = actions + super().__init__(name=name, **kwargs) + self.type: str = "delay" + self.duration = duration -class ChaosExperimentStep(_serialization.Model): - """Model that represents a step in the Experiment resource. +class DiscreteAction(Action): + """Model that represents a discrete action. - 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 name: String of the step name. Required. + :ivar type: Enum that discriminates between action models. Required. + :vartype type: str + :ivar name: String that represents a Capability URN. Required. :vartype name: str - :ivar branches: List of branches. Required. - :vartype branches: list[~azure.mgmt.chaos.models.ChaosExperimentBranch] + :ivar parameters: List of key value pairs. Required. + :vartype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] + :ivar selector_id: String that represents a selector. Required. + :vartype selector_id: str """ _validation = { - "name": {"required": True, "min_length": 1}, - "branches": {"required": True, "max_items": 9, "min_items": 1}, + "type": {"required": True}, + "name": {"required": True, "max_length": 2048}, + "parameters": {"required": True}, + "selector_id": {"required": True, "min_length": 1}, } _attribute_map = { + "type": {"key": "type", "type": "str"}, "name": {"key": "name", "type": "str"}, - "branches": {"key": "branches", "type": "[ChaosExperimentBranch]"}, + "parameters": {"key": "parameters", "type": "[KeyValuePair]"}, + "selector_id": {"key": "selectorId", "type": "str"}, } - def __init__(self, *, name: str, branches: List["_models.ChaosExperimentBranch"], **kwargs: Any) -> None: + def __init__(self, *, name: str, parameters: List["_models.KeyValuePair"], selector_id: str, **kwargs: Any) -> None: """ - :keyword name: String of the step name. Required. + :keyword name: String that represents a Capability URN. Required. :paramtype name: str - :keyword branches: List of branches. Required. - :paramtype branches: list[~azure.mgmt.chaos.models.ChaosExperimentBranch] + :keyword parameters: List of key value pairs. Required. + :paramtype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] + :keyword selector_id: String that represents a selector. Required. + :paramtype selector_id: str """ - super().__init__(**kwargs) - self.name = name - self.branches = branches - + super().__init__(name=name, **kwargs) + self.type: str = "discrete" + self.parameters = parameters + self.selector_id = selector_id -class ChaosTargetFilter(_serialization.Model): - """Model that represents available filter types that can be applied to a targets list. - You probably want to use the sub-classes and not this class directly. Known sub-classes are: - ChaosTargetSimpleFilter +class ErrorAdditionalInfo(_serialization.Model): + """The resource management error additional info. - All required parameters must be populated in order to send to Azure. + Variables are only populated by the server, and will be ignored when sending a request. - :ivar type: Enum that discriminates between filter types. Currently only ``Simple`` type is - supported. Required. "Simple" - :vartype type: str or ~azure.mgmt.chaos.models.FilterType + :ivar type: The additional info type. + :vartype type: str + :ivar info: The additional info. + :vartype info: JSON """ _validation = { - "type": {"required": True}, + "type": {"readonly": True}, + "info": {"readonly": True}, } _attribute_map = { "type": {"key": "type", "type": "str"}, + "info": {"key": "info", "type": "object"}, } - _subtype_map = {"type": {"Simple": "ChaosTargetSimpleFilter"}} - def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.type: Optional[str] = None - + self.type = None + self.info = None -class ChaosTargetSelector(_serialization.Model): - """Model that represents a selector in the Experiment resource. - You probably want to use the sub-classes and not this class directly. Known sub-classes are: - ChaosTargetListSelector, ChaosTargetQuerySelector +class ErrorDetail(_serialization.Model): + """The error detail. - All required parameters must be populated in order to send to Azure. + Variables are only populated by the server, and will be ignored when sending a request. - :ivar additional_properties: Unmatched properties from the message are deserialized to this - collection. - :vartype additional_properties: dict[str, any] - :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". - :vartype type: str or ~azure.mgmt.chaos.models.SelectorType - :ivar id: String of the selector ID. Required. - :vartype id: str - :ivar filter: Model that represents available filter types that can be applied to a targets - list. - :vartype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter + :ivar code: The error code. + :vartype code: str + :ivar message: The error message. + :vartype message: str + :ivar target: The error target. + :vartype target: str + :ivar details: The error details. + :vartype details: list[~azure.mgmt.chaos.models.ErrorDetail] + :ivar additional_info: The error additional info. + :vartype additional_info: list[~azure.mgmt.chaos.models.ErrorAdditionalInfo] """ _validation = { - "type": {"required": True}, - "id": {"required": True, "min_length": 1}, + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, + "details": {"readonly": True}, + "additional_info": {"readonly": True}, } _attribute_map = { - "additional_properties": {"key": "", "type": "{object}"}, - "type": {"key": "type", "type": "str"}, - "id": {"key": "id", "type": "str"}, - "filter": {"key": "filter", "type": "ChaosTargetFilter"}, + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, + "details": {"key": "details", "type": "[ErrorDetail]"}, + "additional_info": {"key": "additionalInfo", "type": "[ErrorAdditionalInfo]"}, } - _subtype_map = {"type": {"List": "ChaosTargetListSelector", "Query": "ChaosTargetQuerySelector"}} - - def __init__( - self, - *, - id: str, # pylint: disable=redefined-builtin - additional_properties: Optional[Dict[str, Any]] = None, - filter: Optional["_models.ChaosTargetFilter"] = None, # pylint: disable=redefined-builtin - **kwargs: Any - ) -> None: - """ - :keyword additional_properties: Unmatched properties from the message are deserialized to this - collection. - :paramtype additional_properties: dict[str, any] - :keyword id: String of the selector ID. Required. - :paramtype id: str - :keyword filter: Model that represents available filter types that can be applied to a targets - list. - :paramtype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter - """ + def __init__(self, **kwargs: Any) -> None: + """ """ super().__init__(**kwargs) - self.additional_properties = additional_properties - self.type: Optional[str] = None - self.id = id - self.filter = filter - - -class ChaosTargetListSelector(ChaosTargetSelector): - """Model that represents a list selector. - - All required parameters must be populated in order to send to Azure. - - :ivar additional_properties: Unmatched properties from the message are deserialized to this - collection. - :vartype additional_properties: dict[str, any] - :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". - :vartype type: str or ~azure.mgmt.chaos.models.SelectorType - :ivar id: String of the selector ID. Required. - :vartype id: str - :ivar filter: Model that represents available filter types that can be applied to a targets - list. - :vartype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter - :ivar targets: List of Target references. Required. - :vartype targets: list[~azure.mgmt.chaos.models.TargetReference] - """ - - _validation = { - "type": {"required": True}, - "id": {"required": True, "min_length": 1}, - "targets": {"required": True, "max_items": 50, "min_items": 1}, - } - - _attribute_map = { - "additional_properties": {"key": "", "type": "{object}"}, - "type": {"key": "type", "type": "str"}, - "id": {"key": "id", "type": "str"}, - "filter": {"key": "filter", "type": "ChaosTargetFilter"}, - "targets": {"key": "targets", "type": "[TargetReference]"}, - } - - def __init__( - self, - *, - id: str, # pylint: disable=redefined-builtin - targets: List["_models.TargetReference"], - additional_properties: Optional[Dict[str, Any]] = None, - filter: Optional["_models.ChaosTargetFilter"] = None, # pylint: disable=redefined-builtin - **kwargs: Any - ) -> None: - """ - :keyword additional_properties: Unmatched properties from the message are deserialized to this - collection. - :paramtype additional_properties: dict[str, any] - :keyword id: String of the selector ID. Required. - :paramtype id: str - :keyword filter: Model that represents available filter types that can be applied to a targets - list. - :paramtype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter - :keyword targets: List of Target references. Required. - :paramtype targets: list[~azure.mgmt.chaos.models.TargetReference] - """ - super().__init__(additional_properties=additional_properties, id=id, filter=filter, **kwargs) - self.type: str = "List" - self.targets = targets - - -class ChaosTargetQuerySelector(ChaosTargetSelector): - """Model that represents a query selector. - - All required parameters must be populated in order to send to Azure. - - :ivar additional_properties: Unmatched properties from the message are deserialized to this - collection. - :vartype additional_properties: dict[str, any] - :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". - :vartype type: str or ~azure.mgmt.chaos.models.SelectorType - :ivar id: String of the selector ID. Required. - :vartype id: str - :ivar filter: Model that represents available filter types that can be applied to a targets - list. - :vartype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter - :ivar query_string: Azure Resource Graph (ARG) Query Language query for target resources. - Required. - :vartype query_string: str - :ivar subscription_ids: Subscription id list to scope resource query. Required. - :vartype subscription_ids: list[str] - """ - - _validation = { - "type": {"required": True}, - "id": {"required": True, "min_length": 1}, - "query_string": {"required": True}, - "subscription_ids": {"required": True, "min_items": 1}, - } - - _attribute_map = { - "additional_properties": {"key": "", "type": "{object}"}, - "type": {"key": "type", "type": "str"}, - "id": {"key": "id", "type": "str"}, - "filter": {"key": "filter", "type": "ChaosTargetFilter"}, - "query_string": {"key": "queryString", "type": "str"}, - "subscription_ids": {"key": "subscriptionIds", "type": "[str]"}, - } - - def __init__( - self, - *, - id: str, # pylint: disable=redefined-builtin - query_string: str, - subscription_ids: List[str], - additional_properties: Optional[Dict[str, Any]] = None, - filter: Optional["_models.ChaosTargetFilter"] = None, # pylint: disable=redefined-builtin - **kwargs: Any - ) -> None: - """ - :keyword additional_properties: Unmatched properties from the message are deserialized to this - collection. - :paramtype additional_properties: dict[str, any] - :keyword id: String of the selector ID. Required. - :paramtype id: str - :keyword filter: Model that represents available filter types that can be applied to a targets - list. - :paramtype filter: ~azure.mgmt.chaos.models.ChaosTargetFilter - :keyword query_string: Azure Resource Graph (ARG) Query Language query for target resources. - Required. - :paramtype query_string: str - :keyword subscription_ids: Subscription id list to scope resource query. Required. - :paramtype subscription_ids: list[str] - """ - super().__init__(additional_properties=additional_properties, id=id, filter=filter, **kwargs) - self.type: str = "Query" - self.query_string = query_string - self.subscription_ids = subscription_ids - - -class ChaosTargetSimpleFilter(ChaosTargetFilter): - """Model that represents a simple target filter. - - All required parameters must be populated in order to send to Azure. - - :ivar type: Enum that discriminates between filter types. Currently only ``Simple`` type is - supported. Required. "Simple" - :vartype type: str or ~azure.mgmt.chaos.models.FilterType - :ivar parameters: Model that represents the Simple filter parameters. - :vartype parameters: ~azure.mgmt.chaos.models.ChaosTargetSimpleFilterParameters - """ - - _validation = { - "type": {"required": True}, - } - - _attribute_map = { - "type": {"key": "type", "type": "str"}, - "parameters": {"key": "parameters", "type": "ChaosTargetSimpleFilterParameters"}, - } - - def __init__( - self, *, parameters: Optional["_models.ChaosTargetSimpleFilterParameters"] = None, **kwargs: Any - ) -> None: - """ - :keyword parameters: Model that represents the Simple filter parameters. - :paramtype parameters: ~azure.mgmt.chaos.models.ChaosTargetSimpleFilterParameters - """ - super().__init__(**kwargs) - self.type: str = "Simple" - self.parameters = parameters - - -class ChaosTargetSimpleFilterParameters(_serialization.Model): - """Model that represents the Simple filter parameters. - - :ivar zones: List of Azure availability zones to filter targets by. - :vartype zones: list[str] - """ - - _attribute_map = { - "zones": {"key": "zones", "type": "[str]"}, - } - - def __init__(self, *, zones: Optional[List[str]] = None, **kwargs: Any) -> None: - """ - :keyword zones: List of Azure availability zones to filter targets by. - :paramtype zones: list[str] - """ - super().__init__(**kwargs) - self.zones = zones - - -class ContinuousAction(ChaosExperimentAction): - """Model that represents a continuous action. - - All required parameters must be populated in order to send to Azure. - - :ivar type: Enum that discriminates between action models. Required. - :vartype type: str - :ivar name: String that represents a Capability URN. Required. - :vartype name: str - :ivar duration: ISO8601 formatted string that represents a duration. Required. - :vartype duration: ~datetime.timedelta - :ivar parameters: List of key value pairs. Required. - :vartype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] - :ivar selector_id: String that represents a selector. Required. - :vartype selector_id: str - """ - - _validation = { - "type": {"required": True}, - "name": {"required": True, "max_length": 2048}, - "duration": {"required": True}, - "parameters": {"required": True}, - "selector_id": {"required": True, "min_length": 1}, - } - - _attribute_map = { - "type": {"key": "type", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "duration": {"key": "duration", "type": "duration"}, - "parameters": {"key": "parameters", "type": "[KeyValuePair]"}, - "selector_id": {"key": "selectorId", "type": "str"}, - } - - def __init__( - self, - *, - name: str, - duration: datetime.timedelta, - parameters: List["_models.KeyValuePair"], - selector_id: str, - **kwargs: Any - ) -> None: - """ - :keyword name: String that represents a Capability URN. Required. - :paramtype name: str - :keyword duration: ISO8601 formatted string that represents a duration. Required. - :paramtype duration: ~datetime.timedelta - :keyword parameters: List of key value pairs. Required. - :paramtype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] - :keyword selector_id: String that represents a selector. Required. - :paramtype selector_id: str - """ - super().__init__(name=name, **kwargs) - self.type: str = "continuous" - self.duration = duration - self.parameters = parameters - self.selector_id = selector_id - - -class DelayAction(ChaosExperimentAction): - """Model that represents a delay action. - - All required parameters must be populated in order to send to Azure. - - :ivar type: Enum that discriminates between action models. Required. - :vartype type: str - :ivar name: String that represents a Capability URN. Required. - :vartype name: str - :ivar duration: ISO8601 formatted string that represents a duration. Required. - :vartype duration: ~datetime.timedelta - """ - - _validation = { - "type": {"required": True}, - "name": {"required": True, "max_length": 2048}, - "duration": {"required": True}, - } - - _attribute_map = { - "type": {"key": "type", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "duration": {"key": "duration", "type": "duration"}, - } - - def __init__(self, *, name: str, duration: datetime.timedelta, **kwargs: Any) -> None: - """ - :keyword name: String that represents a Capability URN. Required. - :paramtype name: str - :keyword duration: ISO8601 formatted string that represents a duration. Required. - :paramtype duration: ~datetime.timedelta - """ - super().__init__(name=name, **kwargs) - self.type: str = "delay" - self.duration = duration - - -class DiscreteAction(ChaosExperimentAction): - """Model that represents a discrete action. - - All required parameters must be populated in order to send to Azure. - - :ivar type: Enum that discriminates between action models. Required. - :vartype type: str - :ivar name: String that represents a Capability URN. Required. - :vartype name: str - :ivar parameters: List of key value pairs. Required. - :vartype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] - :ivar selector_id: String that represents a selector. Required. - :vartype selector_id: str - """ - - _validation = { - "type": {"required": True}, - "name": {"required": True, "max_length": 2048}, - "parameters": {"required": True}, - "selector_id": {"required": True, "min_length": 1}, - } - - _attribute_map = { - "type": {"key": "type", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "parameters": {"key": "parameters", "type": "[KeyValuePair]"}, - "selector_id": {"key": "selectorId", "type": "str"}, - } - - def __init__(self, *, name: str, parameters: List["_models.KeyValuePair"], selector_id: str, **kwargs: Any) -> None: - """ - :keyword name: String that represents a Capability URN. Required. - :paramtype name: str - :keyword parameters: List of key value pairs. Required. - :paramtype parameters: list[~azure.mgmt.chaos.models.KeyValuePair] - :keyword selector_id: String that represents a selector. Required. - :paramtype selector_id: str - """ - super().__init__(name=name, **kwargs) - self.type: str = "discrete" - self.parameters = parameters - self.selector_id = selector_id - - -class ErrorAdditionalInfo(_serialization.Model): - """The resource management error additional info. - - Variables are only populated by the server, and will be ignored when sending a request. - - :ivar type: The additional info type. - :vartype type: str - :ivar info: The additional info. - :vartype info: JSON - """ - - _validation = { - "type": {"readonly": True}, - "info": {"readonly": True}, - } - - _attribute_map = { - "type": {"key": "type", "type": "str"}, - "info": {"key": "info", "type": "object"}, - } - - def __init__(self, **kwargs: Any) -> None: - """ """ - super().__init__(**kwargs) - self.type = None - self.info = None - - -class ErrorDetail(_serialization.Model): - """The error detail. - - Variables are only populated by the server, and will be ignored when sending a request. - - :ivar code: The error code. - :vartype code: str - :ivar message: The error message. - :vartype message: str - :ivar target: The error target. - :vartype target: str - :ivar details: The error details. - :vartype details: list[~azure.mgmt.chaos.models.ErrorDetail] - :ivar additional_info: The error additional info. - :vartype additional_info: list[~azure.mgmt.chaos.models.ErrorAdditionalInfo] - """ - - _validation = { - "code": {"readonly": True}, - "message": {"readonly": True}, - "target": {"readonly": True}, - "details": {"readonly": True}, - "additional_info": {"readonly": True}, - } - - _attribute_map = { - "code": {"key": "code", "type": "str"}, - "message": {"key": "message", "type": "str"}, - "target": {"key": "target", "type": "str"}, - "details": {"key": "details", "type": "[ErrorDetail]"}, - "additional_info": {"key": "additionalInfo", "type": "[ErrorAdditionalInfo]"}, - } - - def __init__(self, **kwargs: Any) -> None: - """ """ - super().__init__(**kwargs) - self.code = None - self.message = None - self.target = None - self.details = None - self.additional_info = None + self.code = None + self.message = None + self.target = None + self.details = None + self.additional_info = None class ErrorResponse(_serialization.Model): @@ -998,10 +696,10 @@ class TrackedResource(Resource): 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: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1046,10 +744,10 @@ class Experiment(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: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1068,9 +766,9 @@ class Experiment(TrackedResource): Known values are: "Succeeded", "Failed", "Canceled", "Creating", "Updating", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.chaos.models.ProvisioningState :ivar steps: List of steps. Required. - :vartype steps: list[~azure.mgmt.chaos.models.ChaosExperimentStep] + :vartype steps: list[~azure.mgmt.chaos.models.Step] :ivar selectors: List of selectors. Required. - :vartype selectors: list[~azure.mgmt.chaos.models.ChaosTargetSelector] + :vartype selectors: list[~azure.mgmt.chaos.models.Selector] """ _validation = { @@ -1093,16 +791,16 @@ class Experiment(TrackedResource): "system_data": {"key": "systemData", "type": "SystemData"}, "identity": {"key": "identity", "type": "ResourceIdentity"}, "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, - "steps": {"key": "properties.steps", "type": "[ChaosExperimentStep]"}, - "selectors": {"key": "properties.selectors", "type": "[ChaosTargetSelector]"}, + "steps": {"key": "properties.steps", "type": "[Step]"}, + "selectors": {"key": "properties.selectors", "type": "[Selector]"}, } def __init__( self, *, location: str, - steps: List["_models.ChaosExperimentStep"], - selectors: List["_models.ChaosTargetSelector"], + steps: List["_models.Step"], + selectors: List["_models.Selector"], tags: Optional[Dict[str, str]] = None, identity: Optional["_models.ResourceIdentity"] = None, **kwargs: Any @@ -1115,9 +813,9 @@ def __init__( :keyword identity: The identity of the experiment resource. :paramtype identity: ~azure.mgmt.chaos.models.ResourceIdentity :keyword steps: List of steps. Required. - :paramtype steps: list[~azure.mgmt.chaos.models.ChaosExperimentStep] + :paramtype steps: list[~azure.mgmt.chaos.models.Step] :keyword selectors: List of selectors. Required. - :paramtype selectors: list[~azure.mgmt.chaos.models.ChaosTargetSelector] + :paramtype selectors: list[~azure.mgmt.chaos.models.Selector] """ super().__init__(tags=tags, location=location, **kwargs) self.system_data = None @@ -1175,7 +873,7 @@ def __init__(self, **kwargs: Any) -> None: self.stopped_at = None -class ExperimentExecutionActionTargetDetailsError(_serialization.Model): +class ExperimentExecutionActionTargetDetailsError(_serialization.Model): # pylint: disable=name-too-long """Model that represents the Experiment action target details error model. Variables are only populated by the server, and will be ignored when sending a request. @@ -1203,7 +901,7 @@ def __init__(self, **kwargs: Any) -> None: self.message = None -class ExperimentExecutionActionTargetDetailsProperties(_serialization.Model): +class ExperimentExecutionActionTargetDetailsProperties(_serialization.Model): # pylint: disable=name-too-long """Model that represents the Experiment action target details properties model. Variables are only populated by the server, and will be ignored when sending a request. @@ -1392,7 +1090,7 @@ def __init__(self, **kwargs: Any) -> None: self.run_information = None -class ExperimentExecutionDetailsPropertiesRunInformation(_serialization.Model): +class ExperimentExecutionDetailsPropertiesRunInformation(_serialization.Model): # pylint: disable=name-too-long """The information of the experiment run. Variables are only populated by the server, and will be ignored when sending a request. @@ -1499,14 +1197,43 @@ def __init__( :paramtype tags: dict[str, str] """ super().__init__(**kwargs) - self.identity = identity - self.tags = tags + self.identity = identity + self.tags = tags + + +class Filter(_serialization.Model): + """Model that represents available filter types that can be applied to a targets list. + + You probably want to use the sub-classes and not this class directly. Known sub-classes are: + SimpleFilter + + All required parameters must be populated in order to send to server. + + :ivar type: Enum that discriminates between filter types. Currently only ``Simple`` type is + supported. Required. "Simple" + :vartype type: str or ~azure.mgmt.chaos.models.FilterType + """ + + _validation = { + "type": {"required": True}, + } + + _attribute_map = { + "type": {"key": "type", "type": "str"}, + } + + _subtype_map = {"type": {"Simple": "SimpleFilter"}} + + def __init__(self, **kwargs: Any) -> None: + """ """ + super().__init__(**kwargs) + self.type: Optional[str] = None class KeyValuePair(_serialization.Model): """A map to describe the settings of an action. - 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 key: The name of the setting for the action. Required. :vartype key: str @@ -1536,6 +1263,124 @@ def __init__(self, *, key: str, value: str, **kwargs: Any) -> None: self.value = value +class Selector(_serialization.Model): + """Model that represents a selector in the Experiment resource. + + You probably want to use the sub-classes and not this class directly. Known sub-classes are: + ListSelector, QuerySelector + + All required parameters must be populated in order to send to server. + + :ivar additional_properties: Unmatched properties from the message are deserialized to this + collection. + :vartype additional_properties: dict[str, any] + :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". + :vartype type: str or ~azure.mgmt.chaos.models.SelectorType + :ivar id: String of the selector ID. Required. + :vartype id: str + :ivar filter: Model that represents available filter types that can be applied to a targets + list. + :vartype filter: ~azure.mgmt.chaos.models.Filter + """ + + _validation = { + "type": {"required": True}, + "id": {"required": True, "min_length": 1}, + } + + _attribute_map = { + "additional_properties": {"key": "", "type": "{object}"}, + "type": {"key": "type", "type": "str"}, + "id": {"key": "id", "type": "str"}, + "filter": {"key": "filter", "type": "Filter"}, + } + + _subtype_map = {"type": {"List": "ListSelector", "Query": "QuerySelector"}} + + def __init__( + self, + *, + id: str, # pylint: disable=redefined-builtin + additional_properties: Optional[Dict[str, Any]] = None, + filter: Optional["_models.Filter"] = None, # pylint: disable=redefined-builtin + **kwargs: Any + ) -> None: + """ + :keyword additional_properties: Unmatched properties from the message are deserialized to this + collection. + :paramtype additional_properties: dict[str, any] + :keyword id: String of the selector ID. Required. + :paramtype id: str + :keyword filter: Model that represents available filter types that can be applied to a targets + list. + :paramtype filter: ~azure.mgmt.chaos.models.Filter + """ + super().__init__(**kwargs) + self.additional_properties = additional_properties + self.type: Optional[str] = None + self.id = id + self.filter = filter + + +class ListSelector(Selector): + """Model that represents a list selector. + + All required parameters must be populated in order to send to server. + + :ivar additional_properties: Unmatched properties from the message are deserialized to this + collection. + :vartype additional_properties: dict[str, any] + :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". + :vartype type: str or ~azure.mgmt.chaos.models.SelectorType + :ivar id: String of the selector ID. Required. + :vartype id: str + :ivar filter: Model that represents available filter types that can be applied to a targets + list. + :vartype filter: ~azure.mgmt.chaos.models.Filter + :ivar targets: List of Target references. Required. + :vartype targets: list[~azure.mgmt.chaos.models.TargetReference] + """ + + _validation = { + "type": {"required": True}, + "id": {"required": True, "min_length": 1}, + "targets": {"required": True, "max_items": 50, "min_items": 1}, + } + + _attribute_map = { + "additional_properties": {"key": "", "type": "{object}"}, + "type": {"key": "type", "type": "str"}, + "id": {"key": "id", "type": "str"}, + "filter": {"key": "filter", "type": "Filter"}, + "targets": {"key": "targets", "type": "[TargetReference]"}, + } + + def __init__( + self, + *, + id: str, # pylint: disable=redefined-builtin + targets: List["_models.TargetReference"], + additional_properties: Optional[Dict[str, Any]] = None, + filter: Optional["_models.Filter"] = None, # pylint: disable=redefined-builtin + **kwargs: Any + ) -> None: + """ + :keyword additional_properties: Unmatched properties from the message are deserialized to this + collection. + :paramtype additional_properties: dict[str, any] + :keyword id: String of the selector ID. Required. + :paramtype id: str + :keyword filter: Model that represents available filter types that can be applied to a targets + list. + :paramtype filter: ~azure.mgmt.chaos.models.Filter + :keyword targets: List of Target references. Required. + :paramtype targets: list[~azure.mgmt.chaos.models.TargetReference] + """ + super().__init__(additional_properties=additional_properties, id=id, filter=filter, **kwargs) + self.type: str = "List" + self.targets = targets + + class Operation(_serialization.Model): """Details of a REST API operation, returned from the Resource Provider Operations API. @@ -1660,6 +1505,8 @@ def __init__(self, **kwargs: Any) -> None: class OperationStatus(ErrorResponse): """The status of operation. + Variables are only populated by the server, and will be ignored when sending a request. + :ivar error: The error object. :vartype error: ~azure.mgmt.chaos.models.ErrorDetail :ivar id: The operation Id. @@ -1667,19 +1514,24 @@ class OperationStatus(ErrorResponse): :ivar name: The operation name. :vartype name: str :ivar start_time: The start time of the operation. - :vartype start_time: str + :vartype start_time: ~datetime.datetime :ivar end_time: The end time of the operation. - :vartype end_time: str + :vartype end_time: ~datetime.datetime :ivar status: The status of the operation. :vartype status: str """ + _validation = { + "start_time": {"readonly": True}, + "end_time": {"readonly": True}, + } + _attribute_map = { "error": {"key": "error", "type": "ErrorDetail"}, "id": {"key": "id", "type": "str"}, "name": {"key": "name", "type": "str"}, - "start_time": {"key": "startTime", "type": "str"}, - "end_time": {"key": "endTime", "type": "str"}, + "start_time": {"key": "startTime", "type": "iso-8601"}, + "end_time": {"key": "endTime", "type": "iso-8601"}, "status": {"key": "status", "type": "str"}, } @@ -1689,8 +1541,6 @@ def __init__( error: Optional["_models.ErrorDetail"] = None, id: Optional[str] = None, # pylint: disable=redefined-builtin name: Optional[str] = None, - start_time: Optional[str] = None, - end_time: Optional[str] = None, status: Optional[str] = None, **kwargs: Any ) -> None: @@ -1701,34 +1551,99 @@ def __init__( :paramtype id: str :keyword name: The operation name. :paramtype name: str - :keyword start_time: The start time of the operation. - :paramtype start_time: str - :keyword end_time: The end time of the operation. - :paramtype end_time: str :keyword status: The status of the operation. :paramtype status: str """ super().__init__(error=error, **kwargs) self.id = id self.name = name - self.start_time = start_time - self.end_time = end_time + self.start_time = None + self.end_time = None self.status = status +class QuerySelector(Selector): + """Model that represents a query selector. + + All required parameters must be populated in order to send to server. + + :ivar additional_properties: Unmatched properties from the message are deserialized to this + collection. + :vartype additional_properties: dict[str, any] + :ivar type: Enum of the selector type. Required. Known values are: "List" and "Query". + :vartype type: str or ~azure.mgmt.chaos.models.SelectorType + :ivar id: String of the selector ID. Required. + :vartype id: str + :ivar filter: Model that represents available filter types that can be applied to a targets + list. + :vartype filter: ~azure.mgmt.chaos.models.Filter + :ivar query_string: Azure Resource Graph (ARG) Query Language query for target resources. + Required. + :vartype query_string: str + :ivar subscription_ids: Subscription id list to scope resource query. Required. + :vartype subscription_ids: list[str] + """ + + _validation = { + "type": {"required": True}, + "id": {"required": True, "min_length": 1}, + "query_string": {"required": True}, + "subscription_ids": {"required": True, "min_items": 1}, + } + + _attribute_map = { + "additional_properties": {"key": "", "type": "{object}"}, + "type": {"key": "type", "type": "str"}, + "id": {"key": "id", "type": "str"}, + "filter": {"key": "filter", "type": "Filter"}, + "query_string": {"key": "queryString", "type": "str"}, + "subscription_ids": {"key": "subscriptionIds", "type": "[str]"}, + } + + def __init__( + self, + *, + id: str, # pylint: disable=redefined-builtin + query_string: str, + subscription_ids: List[str], + additional_properties: Optional[Dict[str, Any]] = None, + filter: Optional["_models.Filter"] = None, # pylint: disable=redefined-builtin + **kwargs: Any + ) -> None: + """ + :keyword additional_properties: Unmatched properties from the message are deserialized to this + collection. + :paramtype additional_properties: dict[str, any] + :keyword id: String of the selector ID. Required. + :paramtype id: str + :keyword filter: Model that represents available filter types that can be applied to a targets + list. + :paramtype filter: ~azure.mgmt.chaos.models.Filter + :keyword query_string: Azure Resource Graph (ARG) Query Language query for target resources. + Required. + :paramtype query_string: str + :keyword subscription_ids: Subscription id list to scope resource query. Required. + :paramtype subscription_ids: list[str] + """ + super().__init__(additional_properties=additional_properties, id=id, filter=filter, **kwargs) + self.type: str = "Query" + self.query_string = query_string + self.subscription_ids = subscription_ids + + class ResourceIdentity(_serialization.Model): """The identity of a resource. 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 type: String of the resource identity type. Required. Known values are: "None", "SystemAssigned", and "UserAssigned". :vartype type: str or ~azure.mgmt.chaos.models.ResourceIdentityType :ivar user_assigned_identities: The list of user identities associated with the Experiment. The user identity dictionary key references will be ARM resource ids in the form: - '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. # pylint: disable=line-too-long :vartype user_assigned_identities: dict[str, ~azure.mgmt.chaos.models.UserAssignedIdentity] :ivar principal_id: GUID that represents the principal ID of this resource identity. :vartype principal_id: str @@ -1768,7 +1683,7 @@ def __init__( :paramtype type: str or ~azure.mgmt.chaos.models.ResourceIdentityType :keyword user_assigned_identities: The list of user identities associated with the Experiment. The user identity dictionary key references will be ARM resource ids in the form: - '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. # pylint: disable=line-too-long :paramtype user_assigned_identities: dict[str, ~azure.mgmt.chaos.models.UserAssignedIdentity] """ super().__init__(**kwargs) @@ -1778,6 +1693,90 @@ def __init__( self.tenant_id = None +class SimpleFilter(Filter): + """Model that represents a simple target filter. + + All required parameters must be populated in order to send to server. + + :ivar type: Enum that discriminates between filter types. Currently only ``Simple`` type is + supported. Required. "Simple" + :vartype type: str or ~azure.mgmt.chaos.models.FilterType + :ivar parameters: Model that represents the Simple filter parameters. + :vartype parameters: ~azure.mgmt.chaos.models.SimpleFilterParameters + """ + + _validation = { + "type": {"required": True}, + } + + _attribute_map = { + "type": {"key": "type", "type": "str"}, + "parameters": {"key": "parameters", "type": "SimpleFilterParameters"}, + } + + def __init__(self, *, parameters: Optional["_models.SimpleFilterParameters"] = None, **kwargs: Any) -> None: + """ + :keyword parameters: Model that represents the Simple filter parameters. + :paramtype parameters: ~azure.mgmt.chaos.models.SimpleFilterParameters + """ + super().__init__(**kwargs) + self.type: str = "Simple" + self.parameters = parameters + + +class SimpleFilterParameters(_serialization.Model): + """Model that represents the Simple filter parameters. + + :ivar zones: List of Azure availability zones to filter targets by. + :vartype zones: list[str] + """ + + _attribute_map = { + "zones": {"key": "zones", "type": "[str]"}, + } + + def __init__(self, *, zones: Optional[List[str]] = None, **kwargs: Any) -> None: + """ + :keyword zones: List of Azure availability zones to filter targets by. + :paramtype zones: list[str] + """ + super().__init__(**kwargs) + self.zones = zones + + +class Step(_serialization.Model): + """Model that represents a step in the Experiment resource. + + All required parameters must be populated in order to send to server. + + :ivar name: String of the step name. Required. + :vartype name: str + :ivar branches: List of branches. Required. + :vartype branches: list[~azure.mgmt.chaos.models.Branch] + """ + + _validation = { + "name": {"required": True, "min_length": 1}, + "branches": {"required": True, "max_items": 9, "min_items": 1}, + } + + _attribute_map = { + "name": {"key": "name", "type": "str"}, + "branches": {"key": "branches", "type": "[Branch]"}, + } + + def __init__(self, *, name: str, branches: List["_models.Branch"], **kwargs: Any) -> None: + """ + :keyword name: String of the step name. Required. + :paramtype name: str + :keyword branches: List of branches. Required. + :paramtype branches: list[~azure.mgmt.chaos.models.Branch] + """ + super().__init__(**kwargs) + self.name = name + self.branches = branches + + class StepStatus(_serialization.Model): """Model that represents the a list of branches and branch statuses. @@ -1885,10 +1884,10 @@ class Target(Resource): 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: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1964,7 +1963,7 @@ def __init__(self, **kwargs: Any) -> None: class TargetReference(_serialization.Model): """Model that represents a reference to a Target in the selector. - 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 type: Enum of the Target reference type. Required. "ChaosTarget" :vartype type: str or ~azure.mgmt.chaos.models.TargetReferenceType @@ -2009,7 +2008,7 @@ class TargetType(Resource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/__init__.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/__init__.py index 531fb369a6b5..90cd0f276024 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/__init__.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/__init__.py @@ -9,10 +9,10 @@ from ._capabilities_operations import CapabilitiesOperations from ._capability_types_operations import CapabilityTypesOperations from ._experiments_operations import ExperimentsOperations -from ._operation_statuses_operations import OperationStatusesOperations from ._operations import Operations -from ._target_types_operations import TargetTypesOperations +from ._operation_statuses_operations import OperationStatusesOperations from ._targets_operations import TargetsOperations +from ._target_types_operations import TargetTypesOperations from ._patch import __all__ as _patch_all from ._patch import * # pylint: disable=unused-wildcard-import @@ -22,10 +22,10 @@ "CapabilitiesOperations", "CapabilityTypesOperations", "ExperimentsOperations", - "OperationStatusesOperations", "Operations", - "TargetTypesOperations", + "OperationStatusesOperations", "TargetsOperations", + "TargetTypesOperations", ] __all__.extend([p for p in _patch_all if p not in __all__]) _patch_sdk() diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capabilities_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capabilities_operations.py index b5be5c4f8109..9308baa52018 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capabilities_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capabilities_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload +import sys +from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload import urllib.parse from azure.core.exceptions import ( @@ -20,16 +21,18 @@ ) 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -51,7 +54,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -109,7 +112,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -166,7 +169,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -223,7 +226,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: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -316,7 +319,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Capability or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.Capability] :raises ~azure.core.exceptions.HttpResponseError: @@ -327,7 +329,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -338,7 +340,7 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -347,12 +349,10 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -364,13 +364,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("CapabilityListResult", pipeline_response) @@ -380,11 +379,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -397,10 +396,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities" - } - @distributed_trace def get( self, @@ -427,12 +422,11 @@ def get( :type target_name: str :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -446,7 +440,7 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Capability] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -455,16 +449,14 @@ def get( capability_name=capability_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -474,16 +466,12 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Capability", pipeline_response) + deserialized = self._deserialize("Capability", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return deserialized # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements @@ -511,12 +499,11 @@ def delete( # pylint: disable=inconsistent-return-statements :type target_name: str :param capability_name: String that represents a Capability resource name. Required. :type capability_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[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -530,7 +517,7 @@ def delete( # pylint: disable=inconsistent-return-statements 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_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -539,16 +526,14 @@ def delete( # pylint: disable=inconsistent-return-statements capability_name=capability_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -559,11 +544,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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload def create_or_update( @@ -599,7 +580,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: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: @@ -614,7 +594,7 @@ def create_or_update( parent_resource_name: str, target_name: str, capability_name: str, - capability: IO, + capability: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -635,11 +615,10 @@ def create_or_update( :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str :param capability: Capability resource to be created or updated. Required. - :type capability: IO + :type capability: 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: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: @@ -654,7 +633,7 @@ def create_or_update( parent_resource_name: str, target_name: str, capability_name: str, - capability: Union[_models.Capability, IO], + capability: Union[_models.Capability, IO[bytes]], **kwargs: Any ) -> _models.Capability: """Create or update a Capability resource that extends a Target resource. @@ -673,17 +652,13 @@ def create_or_update( :param capability_name: String that represents a Capability resource name. Required. :type capability_name: str :param capability: Capability resource to be created or updated. Is either a Capability type or - a IO type. Required. - :type capability: ~azure.mgmt.chaos.models.Capability 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 + a IO[bytes] type. Required. + :type capability: ~azure.mgmt.chaos.models.Capability or IO[bytes] :return: Capability or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Capability :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -706,7 +681,7 @@ def create_or_update( else: _json = self._serialize.body(capability, "Capability") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -718,16 +693,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -737,13 +710,9 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Capability", pipeline_response) + deserialized = self._deserialize("Capability", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}/capabilities/{capabilityName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capability_types_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capability_types_operations.py index c57b755a9cfd..6b9d90c6faf8 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capability_types_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_capability_types_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar +import sys +from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar import urllib.parse from azure.core.exceptions import ( @@ -19,16 +20,18 @@ ) 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -47,7 +50,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -87,7 +90,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -156,7 +159,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CapabilityType or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.CapabilityType] :raises ~azure.core.exceptions.HttpResponseError: @@ -167,7 +169,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityTypeListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -178,18 +180,16 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( location_name=location_name, target_type_name=target_type_name, subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -201,13 +201,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("CapabilityTypeListResult", pipeline_response) @@ -217,11 +216,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -234,10 +233,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}/capabilityTypes" - } - @distributed_trace def get( self, location_name: str, target_type_name: str, capability_type_name: str, **kwargs: Any @@ -250,12 +245,11 @@ def get( :type target_type_name: str :param capability_type_name: String that represents a Capability Type resource name. Required. :type capability_type_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CapabilityType or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.CapabilityType :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -269,22 +263,20 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CapabilityType] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location_name=location_name, target_type_name=target_type_name, capability_type_name=capability_type_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -294,13 +286,9 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CapabilityType", pipeline_response) + deserialized = self._deserialize("CapabilityType", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}/capabilityTypes/{capabilityTypeName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_experiments_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_experiments_operations.py index b0994ce15b12..35faf98161de 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_experiments_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_experiments_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -16,13 +17,14 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod -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 @@ -30,8 +32,11 @@ from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,7 +54,7 @@ def build_list_all_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,7 +96,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -134,7 +139,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -174,7 +179,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +219,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: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -257,7 +262,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -300,7 +305,7 @@ def build_cancel_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -340,7 +345,7 @@ def build_start_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -380,7 +385,7 @@ def build_list_all_executions_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -420,7 +425,7 @@ def build_get_execution_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -466,7 +471,7 @@ def build_execution_details_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -538,7 +543,6 @@ def list_all( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Experiment or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -549,7 +553,7 @@ def list_all( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -560,17 +564,15 @@ def list_all( def prepare_request(next_link=None): if not next_link: - request = build_list_all_request( + _request = build_list_all_request( subscription_id=self._config.subscription_id, running=running, continuation_token_parameter=continuation_token_parameter, api_version=api_version, - template_url=self.list_all.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 @@ -582,13 +584,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("ExperimentListResult", pipeline_response) @@ -598,11 +599,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -615,8 +616,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_all.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/experiments"} - @distributed_trace def list( self, @@ -636,7 +635,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Experiment or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -647,7 +645,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -658,18 +656,16 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, subscription_id=self._config.subscription_id, running=running, continuation_token_parameter=continuation_token_parameter, 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 @@ -681,13 +677,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("ExperimentListResult", pipeline_response) @@ -697,11 +692,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -714,14 +709,8 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments" - } - - def _delete_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + def _delete_initial(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> Iterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -733,38 +722,41 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> LROPoller[None]: @@ -774,14 +766,6 @@ def begin_delete(self, resource_group_name: str, experiment_name: str, **kwargs: :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -795,7 +779,7 @@ def begin_delete(self, resource_group_name: str, experiment_name: str, **kwargs: lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._delete_initial( # type: ignore + raw_result = self._delete_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -804,11 +788,12 @@ def begin_delete(self, resource_group_name: str, experiment_name: str, **kwargs: params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: PollingMethod = cast( @@ -819,17 +804,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def get(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> _models.Experiment: @@ -839,12 +820,11 @@ def get(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Experiment or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Experiment :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -858,21 +838,19 @@ def get(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Experiment] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, experiment_name=experiment_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -882,21 +860,21 @@ def get(self, resource_group_name: str, experiment_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("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", 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/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore def _create_or_update_initial( - self, resource_group_name: str, experiment_name: str, experiment: Union[_models.Experiment, IO], **kwargs: Any - ) -> _models.Experiment: - error_map = { + self, + resource_group_name: str, + experiment_name: str, + experiment: Union[_models.Experiment, IO[bytes]], + **kwargs: Any + ) -> Iterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -909,7 +887,7 @@ def _create_or_update_initial( 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.Experiment] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -919,7 +897,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(experiment, "Experiment") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, @@ -927,40 +905,35 @@ def _create_or_update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_or_update_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) 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("Experiment", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } - @overload def begin_create_or_update( self, @@ -982,14 +955,6 @@ def begin_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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1000,7 +965,7 @@ def begin_create_or_update( self, resource_group_name: str, experiment_name: str, - experiment: IO, + experiment: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1012,18 +977,10 @@ def begin_create_or_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Experiment resource to be created or updated. Required. - :type experiment: IO + :type experiment: 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1031,7 +988,11 @@ def begin_create_or_update( @distributed_trace def begin_create_or_update( - self, resource_group_name: str, experiment_name: str, experiment: Union[_models.Experiment, IO], **kwargs: Any + self, + resource_group_name: str, + experiment_name: str, + experiment: Union[_models.Experiment, IO[bytes]], + **kwargs: Any ) -> LROPoller[_models.Experiment]: """Create or update a Experiment resource. @@ -1040,19 +1001,8 @@ def begin_create_or_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Experiment resource to be created or updated. Is either a Experiment type or - a IO type. Required. - :type experiment: ~azure.mgmt.chaos.models.Experiment 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + a IO[bytes] type. Required. + :type experiment: ~azure.mgmt.chaos.models.Experiment or IO[bytes] :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1078,12 +1028,13 @@ def begin_create_or_update( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1095,26 +1046,24 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.Experiment].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return LROPoller[_models.Experiment]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) def _update_initial( self, resource_group_name: str, experiment_name: str, - experiment: Union[_models.ExperimentUpdate, IO], + experiment: Union[_models.ExperimentUpdate, IO[bytes]], **kwargs: Any - ) -> _models.Experiment: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1127,7 +1076,7 @@ def _update_initial( 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.Experiment] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -1137,7 +1086,7 @@ def _update_initial( else: _json = self._serialize.body(experiment, "ExperimentUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, @@ -1145,35 +1094,34 @@ def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return deserialized # type: ignore @overload def begin_update( @@ -1196,14 +1144,6 @@ def begin_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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1214,7 +1154,7 @@ def begin_update( self, resource_group_name: str, experiment_name: str, - experiment: IO, + experiment: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1226,18 +1166,10 @@ def begin_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Parameters supplied to the Update experiment operation. Required. - :type experiment: IO + :type experiment: 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1248,7 +1180,7 @@ def begin_update( self, resource_group_name: str, experiment_name: str, - experiment: Union[_models.ExperimentUpdate, IO], + experiment: Union[_models.ExperimentUpdate, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.Experiment]: """The operation to update an experiment. @@ -1258,19 +1190,8 @@ def begin_update( :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str :param experiment: Parameters supplied to the Update experiment operation. Is either a - ExperimentUpdate type or a IO type. Required. - :type experiment: ~azure.mgmt.chaos.models.ExperimentUpdate 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 - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + ExperimentUpdate type or a IO[bytes] type. Required. + :type experiment: ~azure.mgmt.chaos.models.ExperimentUpdate or IO[bytes] :return: An instance of LROPoller that returns either Experiment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.chaos.models.Experiment] :raises ~azure.core.exceptions.HttpResponseError: @@ -1296,12 +1217,13 @@ def begin_update( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("Experiment", pipeline_response) + deserialized = self._deserialize("Experiment", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1313,22 +1235,18 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.Experiment].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}" - } + return LROPoller[_models.Experiment]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - def _cancel_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + def _cancel_initial(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> Iterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1340,38 +1258,41 @@ def _cancel_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) - request = build_cancel_request( + _request = build_cancel_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._cancel_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _cancel_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/cancel" - } + return deserialized # type: ignore @distributed_trace def begin_cancel(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> LROPoller[None]: @@ -1381,14 +1302,6 @@ def begin_cancel(self, resource_group_name: str, experiment_name: str, **kwargs: :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -1402,7 +1315,7 @@ def begin_cancel(self, resource_group_name: str, experiment_name: str, **kwargs: lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._cancel_initial( # type: ignore + raw_result = self._cancel_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -1411,11 +1324,12 @@ def begin_cancel(self, resource_group_name: str, experiment_name: str, **kwargs: params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: PollingMethod = cast( @@ -1426,22 +1340,16 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore - begin_cancel.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/cancel" - } - - def _start_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, experiment_name: str, **kwargs: Any - ) -> None: - error_map = { + def _start_initial(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> Iterator[bytes]: + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1453,38 +1361,41 @@ def _start_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) - request = build_start_request( + _request = build_start_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._start_initial.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 + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [202]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - _start_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/start" - } + return deserialized # type: ignore @distributed_trace def begin_start(self, resource_group_name: str, experiment_name: str, **kwargs: Any) -> LROPoller[None]: @@ -1494,14 +1405,6 @@ def begin_start(self, resource_group_name: str, experiment_name: str, **kwargs: :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -1515,7 +1418,7 @@ def begin_start(self, resource_group_name: str, experiment_name: str, **kwargs: lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._start_initial( # type: ignore + raw_result = self._start_initial( resource_group_name=resource_group_name, experiment_name=experiment_name, api_version=api_version, @@ -1524,11 +1427,12 @@ def begin_start(self, resource_group_name: str, experiment_name: str, **kwargs: params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: PollingMethod = cast( @@ -1539,17 +1443,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_start.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/start" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list_all_executions( @@ -1561,7 +1461,6 @@ def list_all_executions( :type resource_group_name: str :param experiment_name: String that represents a Experiment resource name. Required. :type experiment_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ExperimentExecution or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.ExperimentExecution] :raises ~azure.core.exceptions.HttpResponseError: @@ -1572,7 +1471,7 @@ def list_all_executions( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecutionListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1583,17 +1482,15 @@ def list_all_executions( def prepare_request(next_link=None): if not next_link: - request = build_list_all_executions_request( + _request = build_list_all_executions_request( resource_group_name=resource_group_name, experiment_name=experiment_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_all_executions.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 @@ -1605,13 +1502,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("ExperimentExecutionListResult", pipeline_response) @@ -1621,11 +1517,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1638,10 +1534,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_all_executions.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions" - } - @distributed_trace def get_execution( self, resource_group_name: str, experiment_name: str, execution_id: str, **kwargs: Any @@ -1654,12 +1546,11 @@ def get_execution( :type experiment_name: str :param execution_id: GUID that represents a Experiment execution detail. Required. :type execution_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExperimentExecution or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.ExperimentExecution :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1673,22 +1564,20 @@ def get_execution( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecution] = kwargs.pop("cls", None) - request = build_get_execution_request( + _request = build_get_execution_request( resource_group_name=resource_group_name, experiment_name=experiment_name, execution_id=execution_id, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_execution.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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1698,16 +1587,12 @@ def get_execution( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExperimentExecution", pipeline_response) + deserialized = self._deserialize("ExperimentExecution", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_execution.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions/{executionId}" - } + return deserialized # type: ignore @distributed_trace def execution_details( @@ -1721,12 +1606,11 @@ def execution_details( :type experiment_name: str :param execution_id: GUID that represents a Experiment execution detail. Required. :type execution_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: ExperimentExecutionDetails or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.ExperimentExecutionDetails :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1740,22 +1624,20 @@ def execution_details( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ExperimentExecutionDetails] = kwargs.pop("cls", None) - request = build_execution_details_request( + _request = build_execution_details_request( resource_group_name=resource_group_name, experiment_name=experiment_name, execution_id=execution_id, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.execution_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1765,13 +1647,9 @@ def execution_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("ExperimentExecutionDetails", pipeline_response) + deserialized = self._deserialize("ExperimentExecutionDetails", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - execution_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Chaos/experiments/{experimentName}/executions/{executionId}/getExecutionDetails" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operation_statuses_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operation_statuses_operations.py index 7268413932ac..6b6d13d87091 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operation_statuses_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operation_statuses_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar +import sys +from typing import Any, Callable, Dict, Optional, Type, TypeVar from azure.core.exceptions import ( ClientAuthenticationError, @@ -17,16 +18,18 @@ 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -38,7 +41,7 @@ def build_get_request(location: str, async_operation_id: str, subscription_id: s _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,12 +98,11 @@ def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _models. :type location: str :param async_operation_id: The operation Id. Required. :type async_operation_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: OperationStatus or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.OperationStatus :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -114,21 +116,19 @@ def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _models. api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationStatus] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location=location, async_operation_id=async_operation_id, 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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -138,13 +138,9 @@ def get(self, location: str, async_operation_id: str, **kwargs: Any) -> _models. error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("OperationStatus", pipeline_response) + deserialized = self._deserialize("OperationStatus", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{location}/operationStatuses/{asyncOperationId}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operations.py index 5fc5db713dc4..ca6174179c27 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar +import sys +from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar import urllib.parse from azure.core.exceptions import ( @@ -19,16 +20,18 @@ ) 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -40,7 +43,7 @@ def build_list_all_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +81,6 @@ def __init__(self, *args, **kwargs): def list_all(self, **kwargs: Any) -> Iterable["_models.Operation"]: """Get a list all available 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.chaos.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -89,7 +91,7 @@ def list_all(self, **kwargs: Any) -> Iterable["_models.Operation"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -100,14 +102,12 @@ def list_all(self, **kwargs: Any) -> Iterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_all_request( + _request = build_list_all_request( api_version=api_version, - template_url=self.list_all.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 @@ -119,13 +119,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("OperationListResult", pipeline_response) @@ -135,11 +134,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -151,5 +150,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list_all.metadata = {"url": "/providers/Microsoft.Chaos/operations"} diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_target_types_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_target_types_operations.py index 2f529946028a..ea856c8cd192 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_target_types_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_target_types_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,7 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar +import sys +from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar import urllib.parse from azure.core.exceptions import ( @@ -19,16 +20,18 @@ ) 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -42,7 +45,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +81,7 @@ def build_get_request(location_name: str, target_type_name: str, subscription_id _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -138,7 +141,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TargetType or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.TargetType] :raises ~azure.core.exceptions.HttpResponseError: @@ -149,7 +151,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetTypeListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -160,17 +162,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( location_name=location_name, subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -182,13 +182,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("TargetTypeListResult", pipeline_response) @@ -198,11 +197,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -215,10 +214,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes" - } - @distributed_trace def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> _models.TargetType: """Get a Target Type resources for given location. @@ -227,12 +222,11 @@ def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> _mode :type location_name: str :param target_type_name: String that represents a Target Type resource name. Required. :type target_type_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TargetType or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.TargetType :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -246,21 +240,19 @@ def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> _mode api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetType] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( location_name=location_name, target_type_name=target_type_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -270,13 +262,9 @@ def get(self, location_name: str, target_type_name: str, **kwargs: Any) -> _mode error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TargetType", pipeline_response) + deserialized = self._deserialize("TargetType", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Chaos/locations/{locationName}/targetTypes/{targetTypeName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_targets_operations.py b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_targets_operations.py index a42c6b455bc8..41c2f0c65339 100644 --- a/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_targets_operations.py +++ b/sdk/chaos/azure-mgmt-chaos/azure/mgmt/chaos/operations/_targets_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=too-many-lines,too-many-statements # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload +import sys +from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload import urllib.parse from azure.core.exceptions import ( @@ -20,16 +21,18 @@ ) 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 +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -50,7 +53,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -106,7 +109,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -159,7 +162,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -212,7 +215,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: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-12-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -299,7 +302,6 @@ def list( :param continuation_token_parameter: String that sets the continuation token. Default value is None. :type continuation_token_parameter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Target or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.chaos.models.Target] :raises ~azure.core.exceptions.HttpResponseError: @@ -310,7 +312,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TargetListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -321,7 +323,7 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -329,12 +331,10 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, continuation_token_parameter=continuation_token_parameter, 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 @@ -346,13 +346,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("TargetListResult", pipeline_response) @@ -362,11 +361,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -379,10 +378,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets" - } - @distributed_trace def get( self, @@ -406,12 +401,11 @@ def get( :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -425,7 +419,7 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Target] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -433,16 +427,14 @@ def get( target_name=target_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -452,16 +444,12 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Target", pipeline_response) + deserialized = self._deserialize("Target", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return deserialized # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements @@ -486,12 +474,11 @@ def delete( # pylint: disable=inconsistent-return-statements :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_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[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -505,7 +492,7 @@ def delete( # pylint: disable=inconsistent-return-statements 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_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -513,16 +500,14 @@ def delete( # pylint: disable=inconsistent-return-statements target_name=target_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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -533,11 +518,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/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return cls(pipeline_response, None, {}) # type: ignore @overload def create_or_update( @@ -570,7 +551,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: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: @@ -584,7 +564,7 @@ def create_or_update( parent_resource_type: str, parent_resource_name: str, target_name: str, - target: IO, + target: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -603,11 +583,10 @@ def create_or_update( :param target_name: String that represents a Target resource name. Required. :type target_name: str :param target: Target resource to be created or updated. Required. - :type target: IO + :type target: 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: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: @@ -621,7 +600,7 @@ def create_or_update( parent_resource_type: str, parent_resource_name: str, target_name: str, - target: Union[_models.Target, IO], + target: Union[_models.Target, IO[bytes]], **kwargs: Any ) -> _models.Target: """Create or update a Target resource that extends a tracked regional resource. @@ -637,18 +616,14 @@ def create_or_update( :type parent_resource_name: str :param target_name: String that represents a Target resource name. Required. :type target_name: str - :param target: Target resource to be created or updated. Is either a Target type or a IO type. - Required. - :type target: ~azure.mgmt.chaos.models.Target 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 target: Target resource to be created or updated. Is either a Target type or a IO[bytes] + type. Required. + :type target: ~azure.mgmt.chaos.models.Target or IO[bytes] :return: Target or the result of cls(response) :rtype: ~azure.mgmt.chaos.models.Target :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -671,7 +646,7 @@ def create_or_update( else: _json = self._serialize.body(target, "Target") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, parent_provider_namespace=parent_provider_namespace, parent_resource_type=parent_resource_type, @@ -682,16 +657,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=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -701,13 +674,9 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("Target", pipeline_response) + deserialized = self._deserialize("Target", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{parentProviderNamespace}/{parentResourceType}/{parentResourceName}/providers/Microsoft.Chaos/targets/{targetName}" - } + return deserialized # type: ignore diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/cancel_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/cancel_experiment.py index 4854ade601ac..6a0281d66cfe 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/cancel_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/cancel_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -35,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/CancelExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/CancelExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_capability.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_capability.py index aad40e99e0ca..43f59fbb3bc8 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_capability.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_capability.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -41,6 +42,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/CreateUpdateCapability.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/CreateUpdateCapability.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_experiment.py index 119de9de8093..616ef1fa0f3b 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -73,6 +74,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/CreateUpdateExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/CreateUpdateExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_target.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_target.py index 614845fe7f40..6271d7a4daf3 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_target.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/create_update_target.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -40,6 +41,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/CreateUpdateTarget.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/CreateUpdateTarget.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_capability.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_capability.py index abff389ee4a6..df92df855103 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_capability.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_capability.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -39,6 +40,6 @@ def main(): ) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/DeleteCapability.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/DeleteCapability.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_experiment.py index 9969d66f7536..af9d86efb154 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -35,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/DeleteExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/DeleteExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_target.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_target.py index 407d78f68050..107084080540 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_target.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/delete_target.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -38,6 +39,6 @@ def main(): ) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/DeleteTarget.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/DeleteTarget.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/details_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/details_experiment.py index 6eb5968b2f0d..b021ddf1446c 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/details_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/details_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/DetailsExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/DetailsExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability.py index 92577f0b4a8a..c013a2811410 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -40,6 +41,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetCapability.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetCapability.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability_type.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability_type.py index b2cfe7a6a94e..605da7e6cf24 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability_type.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_capability_type.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetCapabilityType.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetCapabilityType.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment.py index bfe414fca38d..9230b3ef08e1 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment_execution.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment_execution.py index 6d0e82124ad8..cd6615fd1ec1 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment_execution.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_experiment_execution.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetExperimentExecution.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetExperimentExecution.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_operation_status.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_operation_status.py index ab3ecc6845c3..33da1dde5986 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_operation_status.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_operation_status.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetOperationStatus.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetOperationStatus.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target.py index 8b8ca5713513..786541bfffb1 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -39,6 +40,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetTarget.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetTarget.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target_type.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target_type.py index b8b190261c7a..69b7f8b6a74c 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target_type.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/get_target_type.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/GetTargetType.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/GetTargetType.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capabilities.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capabilities.py index d5dc982c44f4..cffa25487ec6 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capabilities.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capabilities.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -40,6 +41,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListCapabilities.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListCapabilities.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capability_types.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capability_types.py index 93078a556c5a..036c32d9cd24 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capability_types.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_capability_types.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListCapabilityTypes.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListCapabilityTypes.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiment_executions.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiment_executions.py index a06eef82478c..b3266a8a8363 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiment_executions.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiment_executions.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListExperimentExecutions.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListExperimentExecutions.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_aresource_group.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_aresource_group.py index d04d63ccfcdb..30b3b1a12b40 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_aresource_group.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_aresource_group.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -36,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListExperimentsInAResourceGroup.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListExperimentsInAResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_asubscription.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_asubscription.py index c01d144cb70b..aceb69c6392c 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_asubscription.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_experiments_in_asubscription.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListExperimentsInASubscription.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListExperimentsInASubscription.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_target_types.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_target_types.py index 36f6263bc888..ae03b384ca1f 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_target_types.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_target_types.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -36,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListTargetTypes.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListTargetTypes.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_targets.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_targets.py index 53d7ee234374..fd4d8a44bc3f 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/list_targets.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/list_targets.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -39,6 +40,6 @@ def main(): print(item) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/ListTargets.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/ListTargets.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/start_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/start_experiment.py index 20f2abac8f6f..43b805e7d089 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/start_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/start_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -35,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/StartExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/StartExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_samples/update_experiment.py b/sdk/chaos/azure-mgmt-chaos/generated_samples/update_experiment.py index 3f49562f956e..1bc8715ea678 100644 --- a/sdk/chaos/azure-mgmt-chaos/generated_samples/update_experiment.py +++ b/sdk/chaos/azure-mgmt-chaos/generated_samples/update_experiment.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.chaos import ChaosManagementClient """ @@ -45,6 +46,6 @@ def main(): print(response) -# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/stable/2024-01-01/examples/UpdateExperiment.json +# x-ms-original-file: specification/chaos/resource-manager/Microsoft.Chaos/preview/2024-12-01-preview/examples/UpdateExperiment.json if __name__ == "__main__": main() diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/conftest.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/conftest.py new file mode 100644 index 000000000000..122dee42fe10 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# 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() + + +# aovid record sensitive identity information in recordings +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + chaosmanagement_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + chaosmanagement_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + chaosmanagement_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + chaosmanagement_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=chaosmanagement_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=chaosmanagement_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=chaosmanagement_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=chaosmanagement_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/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations.py new file mode 100644 index 000000000000..4f3aad03b6f4 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations.py @@ -0,0 +1,100 @@ +# 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.chaos import ChaosManagementClient + +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 TestChaosManagementCapabilitiesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list(self, resource_group): + response = self.client.capabilities.list( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.capabilities.get( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_delete(self, resource_group): + response = self.client.capabilities.delete( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_create_or_update(self, resource_group): + response = self.client.capabilities.create_or_update( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + capability={ + "description": "str", + "id": "str", + "name": "str", + "parametersSchema": "str", + "publisher": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "targetType": "str", + "type": "str", + "urn": "str", + }, + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations_async.py new file mode 100644 index 000000000000..ca84f078c45e --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capabilities_operations_async.py @@ -0,0 +1,101 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementCapabilitiesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list(self, resource_group): + response = self.client.capabilities.list( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + 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_get(self, resource_group): + response = await self.client.capabilities.get( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_delete(self, resource_group): + response = await self.client.capabilities.delete( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_create_or_update(self, resource_group): + response = await self.client.capabilities.create_or_update( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + capability_name="str", + capability={ + "description": "str", + "id": "str", + "name": "str", + "parametersSchema": "str", + "publisher": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "targetType": "str", + "type": "str", + "urn": "str", + }, + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations.py new file mode 100644 index 000000000000..1262995c07a6 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations.py @@ -0,0 +1,44 @@ +# 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.chaos import ChaosManagementClient + +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 TestChaosManagementCapabilityTypesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list(self, resource_group): + response = self.client.capability_types.list( + location_name="str", + target_type_name="str", + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.capability_types.get( + location_name="str", + target_type_name="str", + capability_type_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations_async.py new file mode 100644 index 000000000000..870fb441eb1d --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_capability_types_operations_async.py @@ -0,0 +1,45 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementCapabilityTypesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list(self, resource_group): + response = self.client.capability_types.list( + location_name="str", + target_type_name="str", + api_version="2024-12-01-preview", + ) + 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_get(self, resource_group): + response = await self.client.capability_types.get( + location_name="str", + target_type_name="str", + capability_type_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations.py new file mode 100644 index 000000000000..7ddf5f615944 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations.py @@ -0,0 +1,183 @@ +# 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.chaos import ChaosManagementClient + +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 TestChaosManagementExperimentsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list_all(self, resource_group): + response = self.client.experiments.list_all( + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list(self, resource_group): + response = self.client.experiments.list( + resource_group_name=resource_group.name, + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_begin_delete(self, resource_group): + response = self.client.experiments.begin_delete( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.experiments.get( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_begin_create_or_update(self, resource_group): + response = self.client.experiments.begin_create_or_update( + resource_group_name=resource_group.name, + experiment_name="str", + experiment={ + "location": "str", + "selectors": ["selector"], + "steps": [{"branches": [{"actions": ["action"], "name": "str"}], "name": "str"}], + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + }, + api_version="2024-12-01-preview", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_begin_update(self, resource_group): + response = self.client.experiments.begin_update( + resource_group_name=resource_group.name, + experiment_name="str", + experiment={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "tags": {"str": "str"}, + }, + api_version="2024-12-01-preview", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_begin_cancel(self, resource_group): + response = self.client.experiments.begin_cancel( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_begin_start(self, resource_group): + response = self.client.experiments.begin_start( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list_all_executions(self, resource_group): + response = self.client.experiments.list_all_executions( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get_execution(self, resource_group): + response = self.client.experiments.get_execution( + resource_group_name=resource_group.name, + experiment_name="str", + execution_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_execution_details(self, resource_group): + response = self.client.experiments.execution_details( + resource_group_name=resource_group.name, + experiment_name="str", + execution_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations_async.py new file mode 100644 index 000000000000..6abba72517c5 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_experiments_operations_async.py @@ -0,0 +1,194 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementExperimentsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list_all(self, resource_group): + response = self.client.experiments.list_all( + api_version="2024-12-01-preview", + ) + 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_list(self, resource_group): + response = self.client.experiments.list( + resource_group_name=resource_group.name, + api_version="2024-12-01-preview", + ) + 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_begin_delete(self, resource_group): + response = await ( + await self.client.experiments.begin_delete( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_get(self, resource_group): + response = await self.client.experiments.get( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_begin_create_or_update(self, resource_group): + response = await ( + await self.client.experiments.begin_create_or_update( + resource_group_name=resource_group.name, + experiment_name="str", + experiment={ + "location": "str", + "selectors": ["selector"], + "steps": [{"branches": [{"actions": ["action"], "name": "str"}], "name": "str"}], + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + }, + api_version="2024-12-01-preview", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_begin_update(self, resource_group): + response = await ( + await self.client.experiments.begin_update( + resource_group_name=resource_group.name, + experiment_name="str", + experiment={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "tags": {"str": "str"}, + }, + api_version="2024-12-01-preview", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_begin_cancel(self, resource_group): + response = await ( + await self.client.experiments.begin_cancel( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_begin_start(self, resource_group): + response = await ( + await self.client.experiments.begin_start( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list_all_executions(self, resource_group): + response = self.client.experiments.list_all_executions( + resource_group_name=resource_group.name, + experiment_name="str", + api_version="2024-12-01-preview", + ) + 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_get_execution(self, resource_group): + response = await self.client.experiments.get_execution( + resource_group_name=resource_group.name, + experiment_name="str", + execution_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_execution_details(self, resource_group): + response = await self.client.experiments.execution_details( + resource_group_name=resource_group.name, + experiment_name="str", + execution_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations.py new file mode 100644 index 000000000000..58173627d506 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations.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.chaos import ChaosManagementClient + +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 TestChaosManagementOperationStatusesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.operation_statuses.get( + location="str", + async_operation_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations_async.py new file mode 100644 index 000000000000..1f9eddee78e4 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operation_statuses_operations_async.py @@ -0,0 +1,32 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementOperationStatusesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_get(self, resource_group): + response = await self.client.operation_statuses.get( + location="str", + async_operation_id="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operations.py new file mode 100644 index 000000000000..e614ee4e3fbf --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_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.chaos import ChaosManagementClient + +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 TestChaosManagementOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list_all(self, resource_group): + response = self.client.operations.list_all( + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_operations_async.py new file mode 100644 index 000000000000..e4c8f8c00780 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list_all(self, resource_group): + response = self.client.operations.list_all( + api_version="2024-12-01-preview", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations.py new file mode 100644 index 000000000000..e9a70e76b7f8 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations.py @@ -0,0 +1,42 @@ +# 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.chaos import ChaosManagementClient + +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 TestChaosManagementTargetTypesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list(self, resource_group): + response = self.client.target_types.list( + location_name="str", + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.target_types.get( + location_name="str", + target_type_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations_async.py new file mode 100644 index 000000000000..673970996568 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_target_types_operations_async.py @@ -0,0 +1,43 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementTargetTypesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list(self, resource_group): + response = self.client.target_types.list( + location_name="str", + api_version="2024-12-01-preview", + ) + 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_get(self, resource_group): + response = await self.client.target_types.get( + location_name="str", + target_type_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations.py new file mode 100644 index 000000000000..f6b6637cdb71 --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations.py @@ -0,0 +1,93 @@ +# 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.chaos import ChaosManagementClient + +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 TestChaosManagementTargetsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list(self, resource_group): + response = self.client.targets.list( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + api_version="2024-12-01-preview", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_get(self, resource_group): + response = self.client.targets.get( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_delete(self, resource_group): + response = self.client.targets.delete( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_create_or_update(self, resource_group): + response = self.client.targets.create_or_update( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + target={ + "properties": {"str": {}}, + "id": "str", + "location": "str", + "name": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations_async.py b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations_async.py new file mode 100644 index 000000000000..4c3c6838fa8a --- /dev/null +++ b/sdk/chaos/azure-mgmt-chaos/generated_tests/test_chaos_management_targets_operations_async.py @@ -0,0 +1,94 @@ +# 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.chaos.aio import ChaosManagementClient + +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 TestChaosManagementTargetsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(ChaosManagementClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_list(self, resource_group): + response = self.client.targets.list( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + api_version="2024-12-01-preview", + ) + 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_get(self, resource_group): + response = await self.client.targets.get( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_delete(self, resource_group): + response = await self.client.targets.delete( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_create_or_update(self, resource_group): + response = await self.client.targets.create_or_update( + resource_group_name=resource_group.name, + parent_provider_namespace="str", + parent_resource_type="str", + parent_resource_name="str", + target_name="str", + target={ + "properties": {"str": {}}, + "id": "str", + "location": "str", + "name": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2024-12-01-preview", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/chaos/azure-mgmt-chaos/setup.py b/sdk/chaos/azure-mgmt-chaos/setup.py index b3158d889be0..a9e8623ec76d 100644 --- a/sdk/chaos/azure-mgmt-chaos/setup.py +++ b/sdk/chaos/azure-mgmt-chaos/setup.py @@ -74,9 +74,10 @@ "pytyped": ["py.typed"], }, install_requires=[ - "isodate<1.0.0,>=0.6.1", - "azure-common~=1.1", - "azure-mgmt-core>=1.3.2,<2.0.0", + "isodate>=0.6.1", + "typing-extensions>=4.6.0", + "azure-common>=1.1", + "azure-mgmt-core>=1.3.2", ], python_requires=">=3.8", )