From 0fe9b9caac06586dc06b4c76a7d41ea08d18ae66 Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Tue, 11 Jun 2024 02:13:17 +0000 Subject: [PATCH 1/2] code and test --- .../azure-mgmt-storagemover/CHANGELOG.md | 8 + .../azure-mgmt-storagemover/README.md | 4 +- .../azure-mgmt-storagemover/_meta.json | 10 +- .../azure/mgmt/storagemover/_configuration.py | 11 +- .../azure/mgmt/storagemover/_serialization.py | 90 ++-- .../_storage_mover_mgmt_client.py | 28 +- .../azure/mgmt/storagemover/_version.py | 2 +- .../mgmt/storagemover/aio/_configuration.py | 11 +- .../aio/_storage_mover_mgmt_client.py | 30 +- .../aio/operations/_agents_operations.py | 162 +++---- .../aio/operations/_endpoints_operations.py | 162 +++---- .../operations/_job_definitions_operations.py | 208 ++++----- .../aio/operations/_job_runs_operations.py | 57 ++- .../aio/operations/_operations.py | 35 +- .../aio/operations/_projects_operations.py | 162 +++---- .../operations/_storage_movers_operations.py | 191 +++----- .../mgmt/storagemover/models/__init__.py | 16 + .../mgmt/storagemover/models/_models_py3.py | 415 +++++++++++++++--- .../_storage_mover_mgmt_client_enums.py | 27 +- .../operations/_agents_operations.py | 172 +++----- .../operations/_endpoints_operations.py | 172 +++----- .../operations/_job_definitions_operations.py | 222 ++++------ .../operations/_job_runs_operations.py | 61 ++- .../storagemover/operations/_operations.py | 37 +- .../operations/_projects_operations.py | 172 +++----- .../operations/_storage_movers_operations.py | 203 ++++----- .../agents_create_or_update_maximum_set.py | 62 +++ ...=> agents_create_or_update_minimum_set.py} | 8 +- ..._update_upload_limit_schedule_overnight.py | 67 +++ .../generated_samples/agents_delete.py | 3 +- ...gents_get.py => agents_get_maximum_set.py} | 5 +- .../agents_get_minimum_set.py | 43 ++ ...nts_list.py => agents_list_maximum_set.py} | 5 +- .../agents_list_minimum_set.py | 43 ++ .../generated_samples/agents_update.py | 21 +- ..._or_update_azure_storage_blob_container.py | 5 +- ..._or_update_azure_storage_smb_file_share.py | 5 +- .../endpoints_create_or_update_nfs_mount.py | 5 +- .../endpoints_create_or_update_smb_mount.py | 5 +- .../generated_samples/endpoints_delete.py | 3 +- ...points_get_azure_storage_blob_container.py | 3 +- ...points_get_azure_storage_smb_file_share.py | 3 +- .../endpoints_get_nfs_mount.py | 3 +- .../endpoints_get_smb_mount.py | 3 +- .../generated_samples/endpoints_list.py | 3 +- ...nts_update_azure_storage_blob_container.py | 5 +- ...nts_update_azure_storage_smb_file_share.py | 5 +- .../endpoints_update_nfs_mount.py | 5 +- .../endpoints_update_smb_mount.py | 5 +- .../job_definitions_create_or_update.py | 5 +- .../job_definitions_delete.py | 3 +- .../generated_samples/job_definitions_get.py | 3 +- .../generated_samples/job_definitions_list.py | 3 +- .../job_definitions_start_job.py | 3 +- .../job_definitions_stop_job.py | 3 +- .../job_definitions_update.py | 5 +- .../generated_samples/job_runs_get.py | 3 +- .../generated_samples/job_runs_list.py | 3 +- .../generated_samples/operations_list.py | 3 +- .../projects_create_or_update.py | 5 +- .../generated_samples/projects_delete.py | 3 +- .../generated_samples/projects_get.py | 3 +- .../generated_samples/projects_list.py | 3 +- .../generated_samples/projects_update.py | 5 +- .../storage_movers_create_or_update.py | 5 +- .../storage_movers_delete.py | 3 +- .../generated_samples/storage_movers_get.py | 3 +- .../generated_samples/storage_movers_list.py | 3 +- .../storage_movers_list_by_subscription.py | 3 +- .../storage_movers_update.py | 5 +- .../azure-mgmt-storagemover/setup.py | 11 +- 71 files changed, 1618 insertions(+), 1451 deletions(-) create mode 100644 sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_maximum_set.py rename sdk/storagemover/azure-mgmt-storagemover/generated_samples/{agents_create_or_update.py => agents_create_or_update_minimum_set.py} (91%) create mode 100644 sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_upload_limit_schedule_overnight.py rename sdk/storagemover/azure-mgmt-storagemover/generated_samples/{agents_get.py => agents_get_maximum_set.py} (92%) create mode 100644 sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_minimum_set.py rename sdk/storagemover/azure-mgmt-storagemover/generated_samples/{agents_list.py => agents_list_maximum_set.py} (92%) create mode 100644 sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_minimum_set.py diff --git a/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md b/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md index a47a199a0900..5eece2c6b0f4 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md +++ b/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md @@ -1,5 +1,13 @@ # Release History +## 2.1.0 (2024-07-22) + +### Features Added + + - Model Agent has a new parameter time_zone + - Model Agent has a new parameter upload_limit_schedule + - Model AgentUpdateParameters has a new parameter upload_limit_schedule + ## 2.0.0 (2023-10-23) ### Features Added diff --git a/sdk/storagemover/azure-mgmt-storagemover/README.md b/sdk/storagemover/azure-mgmt-storagemover/README.md index 3a6ba3713e11..9b4a661956dc 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/README.md +++ b/sdk/storagemover/azure-mgmt-storagemover/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Storagemover Management Client Library. -This package has been tested with Python 3.7+. +This package has been tested with Python 3.8+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ @@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For ### Prerequisites -- Python 3.7+ is required to use this package. +- Python 3.8+ is required to use this package. - [Azure subscription](https://azure.microsoft.com/free/) ### Install the package diff --git a/sdk/storagemover/azure-mgmt-storagemover/_meta.json b/sdk/storagemover/azure-mgmt-storagemover/_meta.json index b5eff41ee591..3a7374cd5e55 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/_meta.json +++ b/sdk/storagemover/azure-mgmt-storagemover/_meta.json @@ -1,11 +1,11 @@ { - "commit": "0ebd4949e8e1cd9537ca5a07384c7661162cc7a6", + "commit": "f45a76fc39f033947ed12faf4b6416e1e19724cd", "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.13.16", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/storagemover/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/storagemover/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.13.16 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/storagemover/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_configuration.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_configuration.py index 047e360aa251..cd2272e49b87 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_configuration.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_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 StorageMoverMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class StorageMoverMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for StorageMoverMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +28,13 @@ class StorageMoverMgmtClientConfiguration(Configuration): # pylint: disable=too :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-10-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-07-01". 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(StorageMoverMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-10-01") + api_version: str = kwargs.pop("api_version", "2024-07-01") 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-storagemover/{}".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/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_serialization.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_serialization.py index 4bae2292227b..2f781d740827 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_serialization.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_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,7 @@ 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 raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) @classmethod @@ -170,13 +170,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 +288,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 +333,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 +344,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 +383,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 +408,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 +438,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 +538,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 +554,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 +642,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 +661,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 +703,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 +723,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 +738,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 +747,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 +798,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 +818,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 +987,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 +1164,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 +1203,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 +1223,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 +1363,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 +1383,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,7 +1436,7 @@ 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) @@ -1481,7 +1473,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 +1507,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 +1570,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 +1644,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 +1692,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 +1749,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 +1800,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 +1853,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 +1884,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 +1901,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 +1936,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 +1973,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 +1989,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/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_storage_mover_mgmt_client.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_storage_mover_mgmt_client.py index cc576c0b1520..b8da3ca05fa0 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_storage_mover_mgmt_client.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_storage_mover_mgmt_client.py @@ -9,8 +9,10 @@ from copy import deepcopy from typing import Any, TYPE_CHECKING +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 StorageMoverMgmtClientConfiguration @@ -53,7 +55,7 @@ class StorageMoverMgmtClient: # pylint: disable=client-accepts-api-version-keyw :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 "2023-10-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-07-01". 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 @@ -70,7 +72,25 @@ def __init__( self._config = StorageMoverMgmtClientConfiguration( 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) @@ -84,7 +104,7 @@ def __init__( self.job_definitions = JobDefinitionsOperations(self._client, self._config, self._serialize, self._deserialize) self.job_runs = JobRunsOperations(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 @@ -104,7 +124,7 @@ 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() diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_version.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_version.py index 48944bf3938a..83f24ab50946 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_version.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0" +VERSION = "2.1.0" diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_configuration.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_configuration.py index 5e7377318ef7..46ae0ccb4eac 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_configuration.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/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 StorageMoverMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class StorageMoverMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for StorageMoverMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +28,13 @@ class StorageMoverMgmtClientConfiguration(Configuration): # pylint: disable=too :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-10-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-07-01". 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(StorageMoverMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-10-01") + api_version: str = kwargs.pop("api_version", "2024-07-01") 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-storagemover/{}".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/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_storage_mover_mgmt_client.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_storage_mover_mgmt_client.py index 36a4cd7d3559..fc0d7f529767 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_storage_mover_mgmt_client.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/_storage_mover_mgmt_client.py @@ -9,8 +9,10 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING +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 @@ -53,7 +55,7 @@ class StorageMoverMgmtClient: # pylint: disable=client-accepts-api-version-keyw :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 "2023-10-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-07-01". 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 @@ -70,7 +72,25 @@ def __init__( self._config = StorageMoverMgmtClientConfiguration( 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) @@ -84,7 +104,9 @@ def __init__( self.job_definitions = JobDefinitionsOperations(self._client, self._config, self._serialize, self._deserialize) self.job_runs = JobRunsOperations(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 @@ -104,7 +126,7 @@ 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() diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_agents_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_agents_operations.py index 426ab869a9b7..91e67c64fc99 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_agents_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_agents_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, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -39,6 +40,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]] @@ -71,7 +76,6 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Agent or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.Agent] :raises ~azure.core.exceptions.HttpResponseError: @@ -82,7 +86,7 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AgentList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -93,17 +97,16 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -115,13 +118,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("AgentList", pipeline_response) @@ -131,11 +134,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 +151,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents" - } - @distributed_trace_async async def get( self, resource_group_name: str, storage_mover_name: str, agent_name: str, **kwargs: Any @@ -165,12 +164,11 @@ async def get( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -184,22 +182,21 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Agent] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_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 = _convert_request(_request) + _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 @@ -212,13 +209,9 @@ async def get( deserialized = self._deserialize("Agent", pipeline_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.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore @overload async def create_or_update( @@ -246,7 +239,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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -258,7 +250,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: IO, + agent: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -274,11 +266,10 @@ async def create_or_update( :param agent_name: The name of the Agent resource. Required. :type agent_name: str :param agent: Required. - :type agent: IO + :type agent: 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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -290,7 +281,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: Union[_models.Agent, IO], + agent: Union[_models.Agent, IO[bytes]], **kwargs: Any ) -> _models.Agent: """Creates or updates an Agent resource, which references a hybrid compute machine that can run @@ -303,17 +294,13 @@ async def create_or_update( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :param agent: Is either a Agent type or a IO type. Required. - :type agent: ~azure.mgmt.storagemover.models.Agent 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 agent: Is either a Agent type or a IO[bytes] type. Required. + :type agent: ~azure.mgmt.storagemover.models.Agent or IO[bytes] :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -336,7 +323,7 @@ async def create_or_update( else: _json = self._serialize.body(agent, "Agent") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_name, @@ -345,16 +332,15 @@ 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 = _convert_request(_request) + _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 @@ -367,13 +353,9 @@ async def create_or_update( deserialized = self._deserialize("Agent", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore @overload async def update( @@ -400,7 +382,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -412,7 +393,7 @@ async def update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: IO, + agent: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -427,11 +408,10 @@ async def update( :param agent_name: The name of the Agent resource. Required. :type agent_name: str :param agent: Required. - :type agent: IO + :type agent: 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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -443,7 +423,7 @@ async def update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: Union[_models.AgentUpdateParameters, IO], + agent: Union[_models.AgentUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Agent: """Creates or updates an Agent resource. @@ -455,17 +435,13 @@ async def update( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :param agent: Is either a AgentUpdateParameters type or a IO type. Required. - :type agent: ~azure.mgmt.storagemover.models.AgentUpdateParameters 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 agent: Is either a AgentUpdateParameters type or a IO[bytes] type. Required. + :type agent: ~azure.mgmt.storagemover.models.AgentUpdateParameters or IO[bytes] :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -488,7 +464,7 @@ async def update( else: _json = self._serialize.body(agent, "AgentUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_name, @@ -497,16 +473,15 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -519,18 +494,14 @@ async def update( deserialized = self._deserialize("Agent", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, agent_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -544,22 +515,21 @@ async def _delete_initial( # 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, storage_mover_name=storage_mover_name, agent_name=agent_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 = _convert_request(_request) + _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 @@ -570,11 +540,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async async def begin_delete( @@ -589,14 +555,6 @@ async def begin_delete( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_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: @@ -624,7 +582,7 @@ async def begin_delete( 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( @@ -635,14 +593,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_endpoints_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_endpoints_operations.py index a44032d13fd1..85c1573df904 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_endpoints_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_endpoints_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, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -39,6 +40,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]] @@ -73,7 +78,6 @@ def list( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Endpoint or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.Endpoint] :raises ~azure.core.exceptions.HttpResponseError: @@ -84,7 +88,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.EndpointList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -95,17 +99,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, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -117,13 +120,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("EndpointList", pipeline_response) @@ -133,11 +136,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 @@ -150,10 +153,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints" - } - @distributed_trace_async async def get( self, resource_group_name: str, storage_mover_name: str, endpoint_name: str, **kwargs: Any @@ -167,12 +166,11 @@ async def get( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -186,22 +184,21 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Endpoint] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_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 = _convert_request(_request) + _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 @@ -214,13 +211,9 @@ async def get( deserialized = self._deserialize("Endpoint", pipeline_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.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore @overload async def create_or_update( @@ -248,7 +241,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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -260,7 +252,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: IO, + endpoint: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -276,11 +268,10 @@ async def create_or_update( :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str :param endpoint: Required. - :type endpoint: IO + :type endpoint: 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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -292,7 +283,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: Union[_models.Endpoint, IO], + endpoint: Union[_models.Endpoint, IO[bytes]], **kwargs: Any ) -> _models.Endpoint: """Creates or updates an Endpoint resource, which represents a data transfer source or @@ -305,17 +296,13 @@ async def create_or_update( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :param endpoint: Is either a Endpoint type or a IO type. Required. - :type endpoint: ~azure.mgmt.storagemover.models.Endpoint 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 endpoint: Is either a Endpoint type or a IO[bytes] type. Required. + :type endpoint: ~azure.mgmt.storagemover.models.Endpoint or IO[bytes] :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -338,7 +325,7 @@ async def create_or_update( else: _json = self._serialize.body(endpoint, "Endpoint") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_name, @@ -347,16 +334,15 @@ 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 = _convert_request(_request) + _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 @@ -369,13 +355,9 @@ async def create_or_update( deserialized = self._deserialize("Endpoint", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore @overload async def update( @@ -403,7 +385,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -415,7 +396,7 @@ async def update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: IO, + endpoint: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -431,11 +412,10 @@ async def update( :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str :param endpoint: Required. - :type endpoint: IO + :type endpoint: 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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -447,7 +427,7 @@ async def update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: Union[_models.EndpointBaseUpdateParameters, IO], + endpoint: Union[_models.EndpointBaseUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Endpoint: """Updates properties for an Endpoint resource. Properties not specified in the request body will @@ -460,17 +440,13 @@ async def update( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :param endpoint: Is either a EndpointBaseUpdateParameters type or a IO type. Required. - :type endpoint: ~azure.mgmt.storagemover.models.EndpointBaseUpdateParameters 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 endpoint: Is either a EndpointBaseUpdateParameters type or a IO[bytes] type. Required. + :type endpoint: ~azure.mgmt.storagemover.models.EndpointBaseUpdateParameters or IO[bytes] :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -493,7 +469,7 @@ async def update( else: _json = self._serialize.body(endpoint, "EndpointBaseUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_name, @@ -502,16 +478,15 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -524,18 +499,14 @@ async def update( deserialized = self._deserialize("Endpoint", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, endpoint_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -549,22 +520,21 @@ async def _delete_initial( # 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, storage_mover_name=storage_mover_name, endpoint_name=endpoint_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 = _convert_request(_request) + _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 @@ -575,11 +545,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async async def begin_delete( @@ -594,14 +560,6 @@ async def begin_delete( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_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: @@ -629,7 +587,7 @@ async def begin_delete( 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( @@ -640,14 +598,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_definitions_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_definitions_operations.py index a42a7ae1d182..0e8f8473c0ea 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_definitions_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_definitions_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, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -41,6 +42,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]] @@ -77,7 +82,6 @@ def list( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either JobDefinition or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.JobDefinition] :raises ~azure.core.exceptions.HttpResponseError: @@ -88,7 +92,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobDefinitionList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -99,18 +103,17 @@ 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, storage_mover_name=storage_mover_name, project_name=project_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -122,13 +125,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("JobDefinitionList", pipeline_response) @@ -138,11 +141,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 @@ -155,10 +158,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions" - } - @distributed_trace_async async def get( self, @@ -179,12 +178,11 @@ async def get( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -198,23 +196,22 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobDefinition] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_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 = _convert_request(_request) + _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 @@ -227,13 +224,9 @@ async def get( deserialized = self._deserialize("JobDefinition", pipeline_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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore @overload async def create_or_update( @@ -264,7 +257,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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -277,7 +269,7 @@ async def create_or_update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: IO, + job_definition: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -295,11 +287,10 @@ async def create_or_update( :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str :param job_definition: Required. - :type job_definition: IO + :type job_definition: 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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -312,7 +303,7 @@ async def create_or_update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: Union[_models.JobDefinition, IO], + job_definition: Union[_models.JobDefinition, IO[bytes]], **kwargs: Any ) -> _models.JobDefinition: """Creates or updates a Job Definition resource, which contains configuration for a single unit of @@ -327,17 +318,13 @@ async def create_or_update( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :param job_definition: Is either a JobDefinition type or a IO type. Required. - :type job_definition: ~azure.mgmt.storagemover.models.JobDefinition 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 job_definition: Is either a JobDefinition type or a IO[bytes] type. Required. + :type job_definition: ~azure.mgmt.storagemover.models.JobDefinition or IO[bytes] :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -360,7 +347,7 @@ async def create_or_update( else: _json = self._serialize.body(job_definition, "JobDefinition") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -370,16 +357,15 @@ 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 = _convert_request(_request) + _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 @@ -392,13 +378,9 @@ async def create_or_update( deserialized = self._deserialize("JobDefinition", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore @overload async def update( @@ -429,7 +411,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -442,7 +423,7 @@ async def update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: IO, + job_definition: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -460,11 +441,10 @@ async def update( :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str :param job_definition: Required. - :type job_definition: IO + :type job_definition: 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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -477,7 +457,7 @@ async def update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: Union[_models.JobDefinitionUpdateParameters, IO], + job_definition: Union[_models.JobDefinitionUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.JobDefinition: """Updates properties for a Job Definition resource. Properties not specified in the request body @@ -492,17 +472,15 @@ async def update( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :param job_definition: Is either a JobDefinitionUpdateParameters type or a IO type. Required. - :type job_definition: ~azure.mgmt.storagemover.models.JobDefinitionUpdateParameters 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 job_definition: Is either a JobDefinitionUpdateParameters type or a IO[bytes] type. + Required. + :type job_definition: ~azure.mgmt.storagemover.models.JobDefinitionUpdateParameters or + IO[bytes] :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -525,7 +503,7 @@ async def update( else: _json = self._serialize.body(job_definition, "JobDefinitionUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -535,16 +513,15 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -557,13 +534,9 @@ async def update( deserialized = self._deserialize("JobDefinition", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, @@ -573,7 +546,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements job_definition_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -587,23 +560,22 @@ async def _delete_initial( # 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, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_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 = _convert_request(_request) + _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 @@ -614,11 +586,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async async def begin_delete( @@ -640,14 +608,6 @@ async def begin_delete( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_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: @@ -676,7 +636,7 @@ async def begin_delete( 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( @@ -687,17 +647,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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace_async async def start_job( @@ -708,8 +664,8 @@ async def start_job( job_definition_name: str, **kwargs: Any ) -> _models.JobRunResourceId: - """Requests an Agent to start a new instance of this Job Definition, generating a new Job Run - resource. + """Creates a new Job Run resource for the specified Job Definition and passes it to the Agent for + execution. :param resource_group_name: The name of the resource group. The name is case insensitive. Required. @@ -720,12 +676,11 @@ async def start_job( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRunResourceId or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRunResourceId :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -739,23 +694,22 @@ async def start_job( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunResourceId] = kwargs.pop("cls", None) - request = build_start_job_request( + _request = build_start_job_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.start_job.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -768,13 +722,9 @@ async def start_job( deserialized = self._deserialize("JobRunResourceId", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - start_job.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/startJob" - } + return deserialized # type: ignore @distributed_trace_async async def stop_job( @@ -796,12 +746,11 @@ async def stop_job( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRunResourceId or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRunResourceId :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -815,23 +764,22 @@ async def stop_job( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunResourceId] = kwargs.pop("cls", None) - request = build_stop_job_request( + _request = build_stop_job_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.stop_job.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -844,10 +792,6 @@ async def stop_job( deserialized = self._deserialize("JobRunResourceId", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - stop_job.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/stopJob" - } + return deserialized # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_runs_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_runs_operations.py index 8010ba0f6e2e..fc7eea85c8ea 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_runs_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_job_runs_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 @@ -30,6 +31,10 @@ from ..._vendor import _convert_request from ...operations._job_runs_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]] @@ -73,7 +78,6 @@ def list( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either JobRun or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.JobRun] :raises ~azure.core.exceptions.HttpResponseError: @@ -84,7 +88,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -95,19 +99,18 @@ 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, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -119,13 +122,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("JobRunList", pipeline_response) @@ -135,11 +138,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 @@ -152,10 +155,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/jobRuns" - } - @distributed_trace_async async def get( self, @@ -179,12 +178,11 @@ async def get( :type job_definition_name: str :param job_run_name: The name of the Job Run resource. Required. :type job_run_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRun or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRun :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -198,7 +196,7 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRun] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -206,16 +204,15 @@ async def get( job_run_name=job_run_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 = _convert_request(_request) + _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 @@ -228,10 +225,6 @@ async def get( deserialized = self._deserialize("JobRun", pipeline_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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/jobRuns/{jobRunName}" - } + return deserialized # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_operations.py index 94ca07949c7b..1e669a005add 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/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 @@ -29,6 +30,10 @@ from ..._vendor import _convert_request from ...operations._operations import 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]] @@ -58,7 +63,6 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: Lists all the supported operations for the Azure Storage Mover REST API. - :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.storagemover.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -69,7 +73,7 @@ def list(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, @@ -80,14 +84,13 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -99,13 +102,13 @@ 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 = _convert_request(_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) @@ -115,11 +118,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 @@ -131,5 +134,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.StorageMover/operations"} diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_projects_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_projects_operations.py index 602622c9bce0..b1f9f7fad458 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_projects_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_projects_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, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -39,6 +40,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]] @@ -73,7 +78,6 @@ def list( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Project or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.Project] :raises ~azure.core.exceptions.HttpResponseError: @@ -84,7 +88,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ProjectList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -95,17 +99,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, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -117,13 +120,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("ProjectList", pipeline_response) @@ -133,11 +136,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 @@ -150,10 +153,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects" - } - @distributed_trace_async async def get( self, resource_group_name: str, storage_mover_name: str, project_name: str, **kwargs: Any @@ -167,12 +166,11 @@ async def get( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -186,22 +184,21 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Project] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_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 = _convert_request(_request) + _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 @@ -214,13 +211,9 @@ async def get( deserialized = self._deserialize("Project", pipeline_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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore @overload async def create_or_update( @@ -247,7 +240,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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -259,7 +251,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: IO, + project: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -274,11 +266,10 @@ async def create_or_update( :param project_name: The name of the Project resource. Required. :type project_name: str :param project: Required. - :type project: IO + :type project: 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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -290,7 +281,7 @@ async def create_or_update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: Union[_models.Project, IO], + project: Union[_models.Project, IO[bytes]], **kwargs: Any ) -> _models.Project: """Creates or updates a Project resource, which is a logical grouping of related jobs. @@ -302,17 +293,13 @@ async def create_or_update( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :param project: Is either a Project type or a IO type. Required. - :type project: ~azure.mgmt.storagemover.models.Project 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 project: Is either a Project type or a IO[bytes] type. Required. + :type project: ~azure.mgmt.storagemover.models.Project or IO[bytes] :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -335,7 +322,7 @@ async def create_or_update( else: _json = self._serialize.body(project, "Project") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -344,16 +331,15 @@ 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 = _convert_request(_request) + _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 @@ -366,13 +352,9 @@ async def create_or_update( deserialized = self._deserialize("Project", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore @overload async def update( @@ -400,7 +382,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -412,7 +393,7 @@ async def update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: IO, + project: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -428,11 +409,10 @@ async def update( :param project_name: The name of the Project resource. Required. :type project_name: str :param project: Required. - :type project: IO + :type project: 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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -444,7 +424,7 @@ async def update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: Union[_models.ProjectUpdateParameters, IO], + project: Union[_models.ProjectUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Project: """Updates properties for a Project resource. Properties not specified in the request body will be @@ -457,17 +437,13 @@ async def update( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :param project: Is either a ProjectUpdateParameters type or a IO type. Required. - :type project: ~azure.mgmt.storagemover.models.ProjectUpdateParameters 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 project: Is either a ProjectUpdateParameters type or a IO[bytes] type. Required. + :type project: ~azure.mgmt.storagemover.models.ProjectUpdateParameters or IO[bytes] :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -490,7 +466,7 @@ async def update( else: _json = self._serialize.body(project, "ProjectUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -499,16 +475,15 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -521,18 +496,14 @@ async def update( deserialized = self._deserialize("Project", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, project_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -546,22 +517,21 @@ async def _delete_initial( # 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, storage_mover_name=storage_mover_name, project_name=project_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 = _convert_request(_request) + _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 @@ -572,11 +542,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async async def begin_delete( @@ -591,14 +557,6 @@ async def begin_delete( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_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: @@ -626,7 +584,7 @@ async def begin_delete( 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( @@ -637,14 +595,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_storage_movers_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_storage_movers_operations.py index 3324eb98264b..3666adbb20f3 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_storage_movers_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/aio/operations/_storage_movers_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, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -40,6 +41,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]] @@ -67,7 +72,6 @@ def __init__(self, *args, **kwargs) -> None: def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageMover"]: """Lists all Storage Movers in a subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageMover or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.StorageMover] :raises ~azure.core.exceptions.HttpResponseError: @@ -78,7 +82,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageM api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMoverList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -89,15 +93,14 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageM def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -109,13 +112,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("StorageMoverList", pipeline_response) @@ -125,11 +128,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 @@ -142,10 +145,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageMover/storageMovers" - } - @distributed_trace def list(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.StorageMover"]: """Lists all Storage Movers in a resource group. @@ -153,7 +152,6 @@ def list(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_model :param resource_group_name: The name of the resource group. The name is case insensitive. Required. :type resource_group_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageMover or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storagemover.models.StorageMover] :raises ~azure.core.exceptions.HttpResponseError: @@ -164,7 +162,7 @@ def list(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_model api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMoverList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -175,16 +173,15 @@ def list(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_model 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, 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -196,13 +193,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("StorageMoverList", pipeline_response) @@ -212,11 +209,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 @@ -229,10 +226,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers" - } - @distributed_trace_async async def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) -> _models.StorageMover: """Gets a Storage Mover resource. @@ -242,12 +235,11 @@ async def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -261,21 +253,20 @@ async def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMover] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_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 = _convert_request(_request) + _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 @@ -288,13 +279,9 @@ async def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: deserialized = self._deserialize("StorageMover", pipeline_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.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore @overload async def create_or_update( @@ -318,7 +305,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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -329,7 +315,7 @@ async def create_or_update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: IO, + storage_mover: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -342,11 +328,10 @@ async def create_or_update( :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str :param storage_mover: Required. - :type storage_mover: IO + :type storage_mover: 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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -357,7 +342,7 @@ async def create_or_update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: Union[_models.StorageMover, IO], + storage_mover: Union[_models.StorageMover, IO[bytes]], **kwargs: Any ) -> _models.StorageMover: """Creates or updates a top-level Storage Mover resource. @@ -367,17 +352,13 @@ async def create_or_update( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :param storage_mover: Is either a StorageMover type or a IO type. Required. - :type storage_mover: ~azure.mgmt.storagemover.models.StorageMover 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 storage_mover: Is either a StorageMover type or a IO[bytes] type. Required. + :type storage_mover: ~azure.mgmt.storagemover.models.StorageMover or IO[bytes] :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -400,7 +381,7 @@ async def create_or_update( else: _json = self._serialize.body(storage_mover, "StorageMover") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, @@ -408,16 +389,15 @@ 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 = _convert_request(_request) + _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 @@ -430,13 +410,9 @@ async def create_or_update( deserialized = self._deserialize("StorageMover", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore @overload async def update( @@ -461,7 +437,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -472,7 +447,7 @@ async def update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: IO, + storage_mover: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -486,11 +461,10 @@ async def update( :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str :param storage_mover: Required. - :type storage_mover: IO + :type storage_mover: 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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -501,7 +475,7 @@ async def update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: Union[_models.StorageMoverUpdateParameters, IO], + storage_mover: Union[_models.StorageMoverUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.StorageMover: """Updates properties for a Storage Mover resource. Properties not specified in the request body @@ -512,17 +486,14 @@ async def update( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :param storage_mover: Is either a StorageMoverUpdateParameters type or a IO type. Required. - :type storage_mover: ~azure.mgmt.storagemover.models.StorageMoverUpdateParameters 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 storage_mover: Is either a StorageMoverUpdateParameters type or a IO[bytes] type. + Required. + :type storage_mover: ~azure.mgmt.storagemover.models.StorageMoverUpdateParameters or IO[bytes] :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -545,7 +516,7 @@ async def update( else: _json = self._serialize.body(storage_mover, "StorageMoverUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, @@ -553,16 +524,15 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -575,18 +545,14 @@ async def update( deserialized = self._deserialize("StorageMover", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -600,21 +566,20 @@ async def _delete_initial( # 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, storage_mover_name=storage_mover_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 = _convert_request(_request) + _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 @@ -625,11 +590,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async async def begin_delete( @@ -642,14 +603,6 @@ async def begin_delete( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_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: @@ -676,7 +629,7 @@ async def begin_delete( 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( @@ -687,14 +640,10 @@ 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.StorageMover/storageMovers/{storageMoverName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/__init__.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/__init__.py index a47c0bf8ed99..d3aa653f840e 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/__init__.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/__init__.py @@ -40,6 +40,7 @@ from ._models_py3 import ProjectList from ._models_py3 import ProjectUpdateParameters from ._models_py3 import ProxyResource +from ._models_py3 import Recurrence from ._models_py3 import Resource from ._models_py3 import SmbMountEndpointProperties from ._models_py3 import SmbMountEndpointUpdateProperties @@ -47,16 +48,23 @@ from ._models_py3 import StorageMoverList from ._models_py3 import StorageMoverUpdateParameters from ._models_py3 import SystemData +from ._models_py3 import Time from ._models_py3 import TrackedResource +from ._models_py3 import UploadLimit +from ._models_py3 import UploadLimitSchedule +from ._models_py3 import UploadLimitWeeklyRecurrence +from ._models_py3 import WeeklyRecurrence from ._storage_mover_mgmt_client_enums import ActionType from ._storage_mover_mgmt_client_enums import AgentStatus from ._storage_mover_mgmt_client_enums import CopyMode from ._storage_mover_mgmt_client_enums import CreatedByType from ._storage_mover_mgmt_client_enums import CredentialType +from ._storage_mover_mgmt_client_enums import DayOfWeek from ._storage_mover_mgmt_client_enums import EndpointType from ._storage_mover_mgmt_client_enums import JobRunScanStatus from ._storage_mover_mgmt_client_enums import JobRunStatus +from ._storage_mover_mgmt_client_enums import Minute from ._storage_mover_mgmt_client_enums import NfsVersion from ._storage_mover_mgmt_client_enums import Origin from ._storage_mover_mgmt_client_enums import ProvisioningState @@ -99,6 +107,7 @@ "ProjectList", "ProjectUpdateParameters", "ProxyResource", + "Recurrence", "Resource", "SmbMountEndpointProperties", "SmbMountEndpointUpdateProperties", @@ -106,15 +115,22 @@ "StorageMoverList", "StorageMoverUpdateParameters", "SystemData", + "Time", "TrackedResource", + "UploadLimit", + "UploadLimitSchedule", + "UploadLimitWeeklyRecurrence", + "WeeklyRecurrence", "ActionType", "AgentStatus", "CopyMode", "CreatedByType", "CredentialType", + "DayOfWeek", "EndpointType", "JobRunScanStatus", "JobRunStatus", + "Minute", "NfsVersion", "Origin", "ProvisioningState", diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_models_py3.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_models_py3.py index b2114a521cbe..c5394adb4823 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_models_py3.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_models_py3.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- import datetime -from typing import Any, Dict, Optional, TYPE_CHECKING, Union +from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union from .. import _serialization @@ -23,7 +23,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 @@ -65,7 +65,7 @@ class ProxyResource(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 @@ -77,34 +77,16 @@ class ProxyResource(Resource): :vartype system_data: ~azure.mgmt.storagemover.models.SystemData """ - _validation = { - "id": {"readonly": True}, - "name": {"readonly": True}, - "type": {"readonly": True}, - "system_data": {"readonly": True}, - } - - _attribute_map = { - "id": {"key": "id", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "type": {"key": "type", "type": "str"}, - "system_data": {"key": "systemData", "type": "SystemData"}, - } - - def __init__(self, **kwargs: Any) -> None: - """ """ - super().__init__(**kwargs) - class Agent(ProxyResource): # pylint: disable=too-many-instance-attributes """The Agent 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 @@ -136,9 +118,17 @@ class Agent(ProxyResource): # pylint: disable=too-many-instance-attributes :vartype number_of_cores: int :ivar uptime_in_seconds: Uptime of the Agent in seconds. :vartype uptime_in_seconds: int + :ivar time_zone: The agent's local time zone represented in Windows format. + :vartype time_zone: str + :ivar upload_limit_schedule: The WAN-link upload limit schedule that applies to any Job Run the + agent executes. Data plane operations (migrating files) are affected. Control plane operations + ensure seamless migration functionality and are not limited by this schedule. The schedule is + interpreted with the agent's local time. + :vartype upload_limit_schedule: ~azure.mgmt.storagemover.models.UploadLimitSchedule :ivar error_details: :vartype error_details: ~azure.mgmt.storagemover.models.AgentPropertiesErrorDetails - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -156,6 +146,7 @@ class Agent(ProxyResource): # pylint: disable=too-many-instance-attributes "memory_in_mb": {"readonly": True}, "number_of_cores": {"readonly": True}, "uptime_in_seconds": {"readonly": True}, + "time_zone": {"readonly": True}, "error_details": {"readonly": True}, "provisioning_state": {"readonly": True}, } @@ -175,12 +166,20 @@ class Agent(ProxyResource): # pylint: disable=too-many-instance-attributes "memory_in_mb": {"key": "properties.memoryInMB", "type": "int"}, "number_of_cores": {"key": "properties.numberOfCores", "type": "int"}, "uptime_in_seconds": {"key": "properties.uptimeInSeconds", "type": "int"}, + "time_zone": {"key": "properties.timeZone", "type": "str"}, + "upload_limit_schedule": {"key": "properties.uploadLimitSchedule", "type": "UploadLimitSchedule"}, "error_details": {"key": "properties.errorDetails", "type": "AgentPropertiesErrorDetails"}, "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, } def __init__( - self, *, arc_resource_id: str, arc_vm_uuid: str, description: Optional[str] = None, **kwargs: Any + self, + *, + arc_resource_id: str, + arc_vm_uuid: str, + description: Optional[str] = None, + upload_limit_schedule: Optional["_models.UploadLimitSchedule"] = None, + **kwargs: Any ) -> None: """ :keyword description: A description for the Agent. @@ -190,6 +189,11 @@ def __init__( :paramtype arc_resource_id: str :keyword arc_vm_uuid: The VM UUID of the Hybrid Compute resource for the Agent. Required. :paramtype arc_vm_uuid: str + :keyword upload_limit_schedule: The WAN-link upload limit schedule that applies to any Job Run + the agent executes. Data plane operations (migrating files) are affected. Control plane + operations ensure seamless migration functionality and are not limited by this schedule. The + schedule is interpreted with the agent's local time. + :paramtype upload_limit_schedule: ~azure.mgmt.storagemover.models.UploadLimitSchedule """ super().__init__(**kwargs) self.description = description @@ -202,6 +206,8 @@ def __init__( self.memory_in_mb = None self.number_of_cores = None self.uptime_in_seconds = None + self.time_zone = None + self.upload_limit_schedule = upload_limit_schedule self.error_details = None self.provisioning_state = None @@ -266,19 +272,37 @@ class AgentUpdateParameters(_serialization.Model): :ivar description: A description for the Agent. :vartype description: str + :ivar upload_limit_schedule: The WAN-link upload limit schedule that applies to any Job Run the + agent executes. Data plane operations (migrating files) are affected. Control plane operations + ensure seamless migration functionality and are not limited by this schedule. The schedule is + interpreted with the agent's local time. + :vartype upload_limit_schedule: ~azure.mgmt.storagemover.models.UploadLimitSchedule """ _attribute_map = { "description": {"key": "properties.description", "type": "str"}, + "upload_limit_schedule": {"key": "properties.uploadLimitSchedule", "type": "UploadLimitSchedule"}, } - def __init__(self, *, description: Optional[str] = None, **kwargs: Any) -> None: + def __init__( + self, + *, + description: Optional[str] = None, + upload_limit_schedule: Optional["_models.UploadLimitSchedule"] = None, + **kwargs: Any + ) -> None: """ :keyword description: A description for the Agent. :paramtype description: str + :keyword upload_limit_schedule: The WAN-link upload limit schedule that applies to any Job Run + the agent executes. Data plane operations (migrating files) are affected. Control plane + operations ensure seamless migration functionality and are not limited by this schedule. The + schedule is interpreted with the agent's local time. + :paramtype upload_limit_schedule: ~azure.mgmt.storagemover.models.UploadLimitSchedule """ super().__init__(**kwargs) self.description = description + self.upload_limit_schedule = upload_limit_schedule class Credentials(_serialization.Model): @@ -287,7 +311,7 @@ class Credentials(_serialization.Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: AzureKeyVaultSmbCredentials - 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: The Credentials type. Required. "AzureKeyVaultSmb" :vartype type: str or ~azure.mgmt.storagemover.models.CredentialType @@ -312,7 +336,7 @@ def __init__(self, **kwargs: Any) -> None: class AzureKeyVaultSmbCredentials(Credentials): """The Azure Key Vault secret URIs which store the credentials. - 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: The Credentials type. Required. "AzureKeyVaultSmb" :vartype type: str or ~azure.mgmt.storagemover.models.CredentialType @@ -360,14 +384,15 @@ class EndpointBaseProperties(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". :vartype endpoint_type: str or ~azure.mgmt.storagemover.models.EndpointType :ivar description: A description for the Endpoint. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -402,19 +427,20 @@ def __init__(self, *, description: Optional[str] = None, **kwargs: Any) -> None: self.provisioning_state = None -class AzureStorageBlobContainerEndpointProperties(EndpointBaseProperties): +class AzureStorageBlobContainerEndpointProperties(EndpointBaseProperties): # pylint: disable=name-too-long """The properties of Azure Storage blob container endpoint. 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". :vartype endpoint_type: str or ~azure.mgmt.storagemover.models.EndpointType :ivar description: A description for the Endpoint. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState :ivar storage_account_resource_id: The Azure Resource ID of the storage account that is the target destination. Required. @@ -471,7 +497,7 @@ class EndpointBaseUpdateProperties(_serialization.Model): AzureStorageSmbFileShareEndpointUpdateProperties, NfsMountEndpointUpdateProperties, SmbMountEndpointUpdateProperties - 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". @@ -508,10 +534,10 @@ def __init__(self, *, description: Optional[str] = None, **kwargs: Any) -> None: self.description = description -class AzureStorageBlobContainerEndpointUpdateProperties(EndpointBaseUpdateProperties): +class AzureStorageBlobContainerEndpointUpdateProperties(EndpointBaseUpdateProperties): # pylint: disable=name-too-long """AzureStorageBlobContainerEndpointUpdateProperties. - 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". @@ -538,19 +564,20 @@ def __init__(self, *, description: Optional[str] = None, **kwargs: Any) -> None: self.endpoint_type: str = "AzureStorageBlobContainer" -class AzureStorageSmbFileShareEndpointProperties(EndpointBaseProperties): +class AzureStorageSmbFileShareEndpointProperties(EndpointBaseProperties): # pylint: disable=name-too-long """The properties of Azure Storage SMB file share endpoint. 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". :vartype endpoint_type: str or ~azure.mgmt.storagemover.models.EndpointType :ivar description: A description for the Endpoint. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState :ivar storage_account_resource_id: The Azure Resource ID of the storage account. Required. :vartype storage_account_resource_id: str @@ -595,10 +622,10 @@ def __init__( self.file_share_name = file_share_name -class AzureStorageSmbFileShareEndpointUpdateProperties(EndpointBaseUpdateProperties): +class AzureStorageSmbFileShareEndpointUpdateProperties(EndpointBaseUpdateProperties): # pylint: disable=name-too-long """The properties of Azure Storage SMB file share endpoint to update. - 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". @@ -630,10 +657,10 @@ class Endpoint(ProxyResource): 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 @@ -820,10 +847,10 @@ class JobDefinition(ProxyResource): # pylint: disable=too-many-instance-attribu 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 @@ -856,14 +883,15 @@ class JobDefinition(ProxyResource): # pylint: disable=too-many-instance-attribu :vartype latest_job_run_resource_id: str :ivar latest_job_run_status: The current status of the Job Run in a non-terminal state, if exists. Known values are: "Queued", "Started", "Running", "CancelRequested", "Canceling", - "Canceled", "Failed", and "Succeeded". + "Canceled", "Failed", "Succeeded", and "PausedByBandwidthManagement". :vartype latest_job_run_status: str or ~azure.mgmt.storagemover.models.JobRunStatus :ivar agent_name: Name of the Agent to assign for new Job Runs of this Job Definition. :vartype agent_name: str :ivar agent_resource_id: Fully qualified resource id of the Agent to assign for new Job Runs of this Job Definition. :vartype agent_resource_id: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -1025,7 +1053,7 @@ class JobRun(ProxyResource): # 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 @@ -1036,7 +1064,8 @@ class JobRun(ProxyResource): # pylint: disable=too-many-instance-attributes information. :vartype system_data: ~azure.mgmt.storagemover.models.SystemData :ivar status: The state of the job execution. Known values are: "Queued", "Started", "Running", - "CancelRequested", "Canceling", "Canceled", "Failed", and "Succeeded". + "CancelRequested", "Canceling", "Canceled", "Failed", "Succeeded", and + "PausedByBandwidthManagement". :vartype status: str or ~azure.mgmt.storagemover.models.JobRunStatus :ivar scan_status: The status of Agent's scanning of source. Known values are: "NotStarted", "Scanning", and "Completed". @@ -1103,7 +1132,8 @@ class JobRun(ProxyResource): # pylint: disable=too-many-instance-attributes :vartype job_definition_properties: JSON :ivar error: Error details. :vartype error: ~azure.mgmt.storagemover.models.JobRunError - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -1301,14 +1331,15 @@ class NfsMountEndpointProperties(EndpointBaseProperties): 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". :vartype endpoint_type: str or ~azure.mgmt.storagemover.models.EndpointType :ivar description: A description for the Endpoint. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState :ivar host: The host name or IP address of the server exporting the file system. Required. :vartype host: str @@ -1364,7 +1395,7 @@ def __init__( class NfsMountEndpointUpdateProperties(EndpointBaseUpdateProperties): """NfsMountEndpointUpdateProperties. - 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". @@ -1518,7 +1549,7 @@ class Project(ProxyResource): 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 @@ -1530,7 +1561,8 @@ class Project(ProxyResource): :vartype system_data: ~azure.mgmt.storagemover.models.SystemData :ivar description: A description for the Project. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -1610,19 +1642,57 @@ def __init__(self, *, description: Optional[str] = None, **kwargs: Any) -> None: self.description = description +class Recurrence(_serialization.Model): + """The schedule recurrence. + + All required parameters must be populated in order to send to server. + + :ivar start_time: The start time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :vartype start_time: ~azure.mgmt.storagemover.models.Time + :ivar end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals are + supported. Required. + :vartype end_time: ~azure.mgmt.storagemover.models.Time + """ + + _validation = { + "start_time": {"required": True}, + "end_time": {"required": True}, + } + + _attribute_map = { + "start_time": {"key": "startTime", "type": "Time"}, + "end_time": {"key": "endTime", "type": "Time"}, + } + + def __init__(self, *, start_time: "_models.Time", end_time: "_models.Time", **kwargs: Any) -> None: + """ + :keyword start_time: The start time of the schedule recurrence. Full hour and 30-minute + intervals are supported. Required. + :paramtype start_time: ~azure.mgmt.storagemover.models.Time + :keyword end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :paramtype end_time: ~azure.mgmt.storagemover.models.Time + """ + super().__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + + class SmbMountEndpointProperties(EndpointBaseProperties): """The properties of SMB share endpoint. 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". :vartype endpoint_type: str or ~azure.mgmt.storagemover.models.EndpointType :ivar description: A description for the Endpoint. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState :ivar host: The host name or IP address of the server exporting the file system. Required. :vartype host: str @@ -1679,7 +1749,7 @@ def __init__( class SmbMountEndpointUpdateProperties(EndpointBaseUpdateProperties): """The properties of SMB share endpoint to update. - 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 endpoint_type: The Endpoint resource type. Required. Known values are: "AzureStorageBlobContainer", "NfsMount", "AzureStorageSmbFileShare", and "SmbMount". @@ -1726,10 +1796,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 @@ -1780,10 +1850,10 @@ class StorageMover(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 @@ -1799,7 +1869,8 @@ class StorageMover(TrackedResource): :vartype location: str :ivar description: A description for the Storage Mover. :vartype description: str - :ivar provisioning_state: The provisioning state of this resource. "Succeeded" + :ivar provisioning_state: The provisioning state of this resource. Known values are: + "Succeeded", "Canceled", "Failed", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.storagemover.models.ProvisioningState """ @@ -1958,3 +2029,221 @@ def __init__( self.last_modified_by = last_modified_by self.last_modified_by_type = last_modified_by_type self.last_modified_at = last_modified_at + + +class Time(_serialization.Model): + """The time of day. + + All required parameters must be populated in order to send to server. + + :ivar hour: The hour element of the time. Allowed values range from 0 (start of the selected + day) to 24 (end of the selected day). Hour value 24 cannot be combined with any other minute + value but 0. Required. + :vartype hour: int + :ivar minute: The minute element of the time. Allowed values are 0 and 30. If not specified, + its value defaults to 0. Known values are: 0 and 30. + :vartype minute: int or ~azure.mgmt.storagemover.models.Minute + """ + + _validation = { + "hour": {"required": True, "maximum": 24, "minimum": 0}, + } + + _attribute_map = { + "hour": {"key": "hour", "type": "int"}, + "minute": {"key": "minute", "type": "int"}, + } + + def __init__(self, *, hour: int, minute: Union[int, "_models.Minute"] = 0, **kwargs: Any) -> None: + """ + :keyword hour: The hour element of the time. Allowed values range from 0 (start of the selected + day) to 24 (end of the selected day). Hour value 24 cannot be combined with any other minute + value but 0. Required. + :paramtype hour: int + :keyword minute: The minute element of the time. Allowed values are 0 and 30. If not specified, + its value defaults to 0. Known values are: 0 and 30. + :paramtype minute: int or ~azure.mgmt.storagemover.models.Minute + """ + super().__init__(**kwargs) + self.hour = hour + self.minute = minute + + +class UploadLimit(_serialization.Model): + """The WAN-link upload limit. + + All required parameters must be populated in order to send to server. + + :ivar limit_in_mbps: The WAN-link upload bandwidth (maximum data transfer rate) in megabits per + second. Value of 0 indicates no throughput is allowed and any running migration job is + effectively paused for the duration of this recurrence. Only data plane operations are governed + by this limit. Control plane operations ensure seamless functionality. The agent may exceed + this limit with control messages, if necessary. Required. + :vartype limit_in_mbps: int + """ + + _validation = { + "limit_in_mbps": {"required": True, "maximum": 2147483647, "minimum": 0}, + } + + _attribute_map = { + "limit_in_mbps": {"key": "limitInMbps", "type": "int"}, + } + + def __init__(self, *, limit_in_mbps: int, **kwargs: Any) -> None: + """ + :keyword limit_in_mbps: The WAN-link upload bandwidth (maximum data transfer rate) in megabits + per second. Value of 0 indicates no throughput is allowed and any running migration job is + effectively paused for the duration of this recurrence. Only data plane operations are governed + by this limit. Control plane operations ensure seamless functionality. The agent may exceed + this limit with control messages, if necessary. Required. + :paramtype limit_in_mbps: int + """ + super().__init__(**kwargs) + self.limit_in_mbps = limit_in_mbps + + +class UploadLimitSchedule(_serialization.Model): + """The WAN-link upload limit schedule. Overlapping recurrences are not allowed. + + :ivar weekly_recurrences: The set of weekly repeating recurrences of the WAN-link upload limit + schedule. + :vartype weekly_recurrences: list[~azure.mgmt.storagemover.models.UploadLimitWeeklyRecurrence] + """ + + _attribute_map = { + "weekly_recurrences": {"key": "weeklyRecurrences", "type": "[UploadLimitWeeklyRecurrence]"}, + } + + def __init__( + self, *, weekly_recurrences: Optional[List["_models.UploadLimitWeeklyRecurrence"]] = None, **kwargs: Any + ) -> None: + """ + :keyword weekly_recurrences: The set of weekly repeating recurrences of the WAN-link upload + limit schedule. + :paramtype weekly_recurrences: + list[~azure.mgmt.storagemover.models.UploadLimitWeeklyRecurrence] + """ + super().__init__(**kwargs) + self.weekly_recurrences = weekly_recurrences + + +class WeeklyRecurrence(Recurrence): + """The weekly recurrence of the schedule. + + All required parameters must be populated in order to send to server. + + :ivar start_time: The start time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :vartype start_time: ~azure.mgmt.storagemover.models.Time + :ivar end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals are + supported. Required. + :vartype end_time: ~azure.mgmt.storagemover.models.Time + :ivar days: The set of days of week for the schedule recurrence. A day must not be specified + more than once in a recurrence. Required. + :vartype days: list[str or ~azure.mgmt.storagemover.models.DayOfWeek] + """ + + _validation = { + "start_time": {"required": True}, + "end_time": {"required": True}, + "days": {"required": True}, + } + + _attribute_map = { + "start_time": {"key": "startTime", "type": "Time"}, + "end_time": {"key": "endTime", "type": "Time"}, + "days": {"key": "days", "type": "[str]"}, + } + + def __init__( + self, + *, + start_time: "_models.Time", + end_time: "_models.Time", + days: List[Union[str, "_models.DayOfWeek"]], + **kwargs: Any + ) -> None: + """ + :keyword start_time: The start time of the schedule recurrence. Full hour and 30-minute + intervals are supported. Required. + :paramtype start_time: ~azure.mgmt.storagemover.models.Time + :keyword end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :paramtype end_time: ~azure.mgmt.storagemover.models.Time + :keyword days: The set of days of week for the schedule recurrence. A day must not be specified + more than once in a recurrence. Required. + :paramtype days: list[str or ~azure.mgmt.storagemover.models.DayOfWeek] + """ + super().__init__(start_time=start_time, end_time=end_time, **kwargs) + self.days = days + + +class UploadLimitWeeklyRecurrence(WeeklyRecurrence, UploadLimit): + """The weekly recurrence of the WAN-link upload limit schedule. The start time must be earlier in + the day than the end time. The recurrence must not span across multiple days. + + All required parameters must be populated in order to send to server. + + :ivar limit_in_mbps: The WAN-link upload bandwidth (maximum data transfer rate) in megabits per + second. Value of 0 indicates no throughput is allowed and any running migration job is + effectively paused for the duration of this recurrence. Only data plane operations are governed + by this limit. Control plane operations ensure seamless functionality. The agent may exceed + this limit with control messages, if necessary. Required. + :vartype limit_in_mbps: int + :ivar start_time: The start time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :vartype start_time: ~azure.mgmt.storagemover.models.Time + :ivar end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals are + supported. Required. + :vartype end_time: ~azure.mgmt.storagemover.models.Time + :ivar days: The set of days of week for the schedule recurrence. A day must not be specified + more than once in a recurrence. Required. + :vartype days: list[str or ~azure.mgmt.storagemover.models.DayOfWeek] + """ + + _validation = { + "limit_in_mbps": {"required": True, "maximum": 2147483647, "minimum": 0}, + "start_time": {"required": True}, + "end_time": {"required": True}, + "days": {"required": True}, + } + + _attribute_map = { + "limit_in_mbps": {"key": "limitInMbps", "type": "int"}, + "start_time": {"key": "startTime", "type": "Time"}, + "end_time": {"key": "endTime", "type": "Time"}, + "days": {"key": "days", "type": "[str]"}, + } + + def __init__( + self, + *, + limit_in_mbps: int, + start_time: "_models.Time", + end_time: "_models.Time", + days: List[Union[str, "_models.DayOfWeek"]], + **kwargs: Any + ) -> None: + """ + :keyword limit_in_mbps: The WAN-link upload bandwidth (maximum data transfer rate) in megabits + per second. Value of 0 indicates no throughput is allowed and any running migration job is + effectively paused for the duration of this recurrence. Only data plane operations are governed + by this limit. Control plane operations ensure seamless functionality. The agent may exceed + this limit with control messages, if necessary. Required. + :paramtype limit_in_mbps: int + :keyword start_time: The start time of the schedule recurrence. Full hour and 30-minute + intervals are supported. Required. + :paramtype start_time: ~azure.mgmt.storagemover.models.Time + :keyword end_time: The end time of the schedule recurrence. Full hour and 30-minute intervals + are supported. Required. + :paramtype end_time: ~azure.mgmt.storagemover.models.Time + :keyword days: The set of days of week for the schedule recurrence. A day must not be specified + more than once in a recurrence. Required. + :paramtype days: list[str or ~azure.mgmt.storagemover.models.DayOfWeek] + """ + super().__init__(start_time=start_time, end_time=end_time, days=days, limit_in_mbps=limit_in_mbps, **kwargs) + self.limit_in_mbps = limit_in_mbps + self.start_time = start_time + self.end_time = end_time + self.days = days diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_storage_mover_mgmt_client_enums.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_storage_mover_mgmt_client_enums.py index 726a28631f66..0d702a92577e 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_storage_mover_mgmt_client_enums.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/models/_storage_mover_mgmt_client_enums.py @@ -49,6 +49,18 @@ class CredentialType(str, Enum, metaclass=CaseInsensitiveEnumMeta): AZURE_KEY_VAULT_SMB = "AzureKeyVaultSmb" +class DayOfWeek(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The day of week.""" + + MONDAY = "Monday" + TUESDAY = "Tuesday" + WEDNESDAY = "Wednesday" + THURSDAY = "Thursday" + FRIDAY = "Friday" + SATURDAY = "Saturday" + SUNDAY = "Sunday" + + class EndpointType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The Endpoint resource type.""" @@ -77,6 +89,16 @@ class JobRunStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): CANCELED = "Canceled" FAILED = "Failed" SUCCEEDED = "Succeeded" + PAUSED_BY_BANDWIDTH_MANAGEMENT = "PausedByBandwidthManagement" + + +class Minute(int, Enum, metaclass=CaseInsensitiveEnumMeta): + """The minute element of the time. Allowed values are 0 and 30. If not specified, its value + defaults to 0. + """ + + ZERO = 0 + THIRTY = 30 class NfsVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): @@ -98,6 +120,9 @@ class Origin(str, Enum, metaclass=CaseInsensitiveEnumMeta): class ProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """The provisioning state of this resource.""" + """The provisioning state of a resource.""" SUCCEEDED = "Succeeded" + CANCELED = "Canceled" + FAILED = "Failed" + DELETING = "Deleting" diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_agents_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_agents_operations.py index ec715daea554..8cdb971c71a0 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_agents_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_agents_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, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -32,6 +33,10 @@ 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]] @@ -45,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +83,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -112,7 +117,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -149,7 +154,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -186,7 +191,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -242,7 +247,6 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Agent or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.Agent] :raises ~azure.core.exceptions.HttpResponseError: @@ -253,7 +257,7 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AgentList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -264,17 +268,16 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -286,13 +289,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("AgentList", pipeline_response) @@ -302,11 +305,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 @@ -319,10 +322,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents" - } - @distributed_trace def get(self, resource_group_name: str, storage_mover_name: str, agent_name: str, **kwargs: Any) -> _models.Agent: """Gets an Agent resource. @@ -334,12 +333,11 @@ def get(self, resource_group_name: str, storage_mover_name: str, agent_name: str :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -353,22 +351,21 @@ def get(self, resource_group_name: str, storage_mover_name: str, agent_name: str api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Agent] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_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 = _convert_request(_request) + _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 @@ -381,13 +378,9 @@ def get(self, resource_group_name: str, storage_mover_name: str, agent_name: str deserialized = self._deserialize("Agent", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore @overload def create_or_update( @@ -415,7 +408,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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -427,7 +419,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: IO, + agent: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -443,11 +435,10 @@ def create_or_update( :param agent_name: The name of the Agent resource. Required. :type agent_name: str :param agent: Required. - :type agent: IO + :type agent: 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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -459,7 +450,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: Union[_models.Agent, IO], + agent: Union[_models.Agent, IO[bytes]], **kwargs: Any ) -> _models.Agent: """Creates or updates an Agent resource, which references a hybrid compute machine that can run @@ -472,17 +463,13 @@ def create_or_update( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :param agent: Is either a Agent type or a IO type. Required. - :type agent: ~azure.mgmt.storagemover.models.Agent 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 agent: Is either a Agent type or a IO[bytes] type. Required. + :type agent: ~azure.mgmt.storagemover.models.Agent or IO[bytes] :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -505,7 +492,7 @@ def create_or_update( else: _json = self._serialize.body(agent, "Agent") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_name, @@ -514,16 +501,15 @@ 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 = _convert_request(_request) + _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 @@ -536,13 +522,9 @@ def create_or_update( deserialized = self._deserialize("Agent", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore @overload def update( @@ -569,7 +551,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -581,7 +562,7 @@ def update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: IO, + agent: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -596,11 +577,10 @@ def update( :param agent_name: The name of the Agent resource. Required. :type agent_name: str :param agent: Required. - :type agent: IO + :type agent: 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: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: @@ -612,7 +592,7 @@ def update( resource_group_name: str, storage_mover_name: str, agent_name: str, - agent: Union[_models.AgentUpdateParameters, IO], + agent: Union[_models.AgentUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Agent: """Creates or updates an Agent resource. @@ -624,17 +604,13 @@ def update( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_name: str - :param agent: Is either a AgentUpdateParameters type or a IO type. Required. - :type agent: ~azure.mgmt.storagemover.models.AgentUpdateParameters 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 agent: Is either a AgentUpdateParameters type or a IO[bytes] type. Required. + :type agent: ~azure.mgmt.storagemover.models.AgentUpdateParameters or IO[bytes] :return: Agent or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Agent :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -657,7 +633,7 @@ def update( else: _json = self._serialize.body(agent, "AgentUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, agent_name=agent_name, @@ -666,16 +642,15 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -688,18 +663,14 @@ def update( deserialized = self._deserialize("Agent", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return deserialized # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, agent_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -713,22 +684,21 @@ def _delete_initial( # 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, storage_mover_name=storage_mover_name, agent_name=agent_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 = _convert_request(_request) + _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 @@ -739,11 +709,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def begin_delete( @@ -758,14 +724,6 @@ def begin_delete( :type storage_mover_name: str :param agent_name: The name of the Agent resource. Required. :type agent_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: @@ -793,7 +751,7 @@ def begin_delete( 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( @@ -804,14 +762,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/agents/{agentName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_endpoints_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_endpoints_operations.py index e51844277a46..18e2e2b69188 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_endpoints_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_endpoints_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, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -32,6 +33,10 @@ 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]] @@ -45,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +83,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -112,7 +117,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -149,7 +154,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -186,7 +191,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -242,7 +247,6 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Endpoint or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.Endpoint] :raises ~azure.core.exceptions.HttpResponseError: @@ -253,7 +257,7 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.EndpointList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -264,17 +268,16 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -286,13 +289,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("EndpointList", pipeline_response) @@ -302,11 +305,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 @@ -319,10 +322,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints" - } - @distributed_trace def get( self, resource_group_name: str, storage_mover_name: str, endpoint_name: str, **kwargs: Any @@ -336,12 +335,11 @@ def get( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -355,22 +353,21 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Endpoint] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_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 = _convert_request(_request) + _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 @@ -383,13 +380,9 @@ def get( deserialized = self._deserialize("Endpoint", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore @overload def create_or_update( @@ -417,7 +410,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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -429,7 +421,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: IO, + endpoint: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -445,11 +437,10 @@ def create_or_update( :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str :param endpoint: Required. - :type endpoint: IO + :type endpoint: 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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -461,7 +452,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: Union[_models.Endpoint, IO], + endpoint: Union[_models.Endpoint, IO[bytes]], **kwargs: Any ) -> _models.Endpoint: """Creates or updates an Endpoint resource, which represents a data transfer source or @@ -474,17 +465,13 @@ def create_or_update( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :param endpoint: Is either a Endpoint type or a IO type. Required. - :type endpoint: ~azure.mgmt.storagemover.models.Endpoint 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 endpoint: Is either a Endpoint type or a IO[bytes] type. Required. + :type endpoint: ~azure.mgmt.storagemover.models.Endpoint or IO[bytes] :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -507,7 +494,7 @@ def create_or_update( else: _json = self._serialize.body(endpoint, "Endpoint") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_name, @@ -516,16 +503,15 @@ 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 = _convert_request(_request) + _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 @@ -538,13 +524,9 @@ def create_or_update( deserialized = self._deserialize("Endpoint", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore @overload def update( @@ -572,7 +554,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -584,7 +565,7 @@ def update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: IO, + endpoint: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -600,11 +581,10 @@ def update( :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str :param endpoint: Required. - :type endpoint: IO + :type endpoint: 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: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: @@ -616,7 +596,7 @@ def update( resource_group_name: str, storage_mover_name: str, endpoint_name: str, - endpoint: Union[_models.EndpointBaseUpdateParameters, IO], + endpoint: Union[_models.EndpointBaseUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Endpoint: """Updates properties for an Endpoint resource. Properties not specified in the request body will @@ -629,17 +609,13 @@ def update( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_name: str - :param endpoint: Is either a EndpointBaseUpdateParameters type or a IO type. Required. - :type endpoint: ~azure.mgmt.storagemover.models.EndpointBaseUpdateParameters 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 endpoint: Is either a EndpointBaseUpdateParameters type or a IO[bytes] type. Required. + :type endpoint: ~azure.mgmt.storagemover.models.EndpointBaseUpdateParameters or IO[bytes] :return: Endpoint or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Endpoint :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -662,7 +638,7 @@ def update( else: _json = self._serialize.body(endpoint, "EndpointBaseUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, endpoint_name=endpoint_name, @@ -671,16 +647,15 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -693,18 +668,14 @@ def update( deserialized = self._deserialize("Endpoint", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return deserialized # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, endpoint_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -718,22 +689,21 @@ def _delete_initial( # 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, storage_mover_name=storage_mover_name, endpoint_name=endpoint_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 = _convert_request(_request) + _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 @@ -744,11 +714,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def begin_delete( @@ -763,14 +729,6 @@ def begin_delete( :type storage_mover_name: str :param endpoint_name: The name of the Endpoint resource. Required. :type endpoint_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: @@ -798,7 +756,7 @@ def begin_delete( 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( @@ -809,14 +767,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/endpoints/{endpointName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_definitions_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_definitions_operations.py index f8456d866ea1..9cb17bf4cac2 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_definitions_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_definitions_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, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -32,6 +33,10 @@ 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]] @@ -45,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -84,7 +89,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -124,7 +129,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -167,7 +172,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -210,7 +215,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -250,7 +255,7 @@ def build_start_job_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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -290,7 +295,7 @@ def build_stop_job_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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -351,7 +356,6 @@ def list( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either JobDefinition or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.JobDefinition] :raises ~azure.core.exceptions.HttpResponseError: @@ -362,7 +366,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobDefinitionList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -373,18 +377,17 @@ 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, storage_mover_name=storage_mover_name, project_name=project_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -396,13 +399,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("JobDefinitionList", pipeline_response) @@ -412,11 +415,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 @@ -429,10 +432,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions" - } - @distributed_trace def get( self, @@ -453,12 +452,11 @@ def get( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -472,23 +470,22 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobDefinition] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_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 = _convert_request(_request) + _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 @@ -501,13 +498,9 @@ def get( deserialized = self._deserialize("JobDefinition", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore @overload def create_or_update( @@ -538,7 +531,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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -551,7 +543,7 @@ def create_or_update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: IO, + job_definition: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -569,11 +561,10 @@ def create_or_update( :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str :param job_definition: Required. - :type job_definition: IO + :type job_definition: 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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -586,7 +577,7 @@ def create_or_update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: Union[_models.JobDefinition, IO], + job_definition: Union[_models.JobDefinition, IO[bytes]], **kwargs: Any ) -> _models.JobDefinition: """Creates or updates a Job Definition resource, which contains configuration for a single unit of @@ -601,17 +592,13 @@ def create_or_update( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :param job_definition: Is either a JobDefinition type or a IO type. Required. - :type job_definition: ~azure.mgmt.storagemover.models.JobDefinition 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 job_definition: Is either a JobDefinition type or a IO[bytes] type. Required. + :type job_definition: ~azure.mgmt.storagemover.models.JobDefinition or IO[bytes] :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -634,7 +621,7 @@ def create_or_update( else: _json = self._serialize.body(job_definition, "JobDefinition") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -644,16 +631,15 @@ 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 = _convert_request(_request) + _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 @@ -666,13 +652,9 @@ def create_or_update( deserialized = self._deserialize("JobDefinition", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore @overload def update( @@ -703,7 +685,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -716,7 +697,7 @@ def update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: IO, + job_definition: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -734,11 +715,10 @@ def update( :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str :param job_definition: Required. - :type job_definition: IO + :type job_definition: 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: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: @@ -751,7 +731,7 @@ def update( storage_mover_name: str, project_name: str, job_definition_name: str, - job_definition: Union[_models.JobDefinitionUpdateParameters, IO], + job_definition: Union[_models.JobDefinitionUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.JobDefinition: """Updates properties for a Job Definition resource. Properties not specified in the request body @@ -766,17 +746,15 @@ def update( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :param job_definition: Is either a JobDefinitionUpdateParameters type or a IO type. Required. - :type job_definition: ~azure.mgmt.storagemover.models.JobDefinitionUpdateParameters 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 job_definition: Is either a JobDefinitionUpdateParameters type or a IO[bytes] type. + Required. + :type job_definition: ~azure.mgmt.storagemover.models.JobDefinitionUpdateParameters or + IO[bytes] :return: JobDefinition or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobDefinition :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -799,7 +777,7 @@ def update( else: _json = self._serialize.body(job_definition, "JobDefinitionUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -809,16 +787,15 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -831,13 +808,9 @@ def update( deserialized = self._deserialize("JobDefinition", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return deserialized # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, @@ -847,7 +820,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements job_definition_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -861,23 +834,22 @@ def _delete_initial( # 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, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_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 = _convert_request(_request) + _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 @@ -888,11 +860,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def begin_delete( @@ -914,14 +882,6 @@ def begin_delete( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_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: @@ -950,7 +910,7 @@ def begin_delete( 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( @@ -961,17 +921,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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def start_job( @@ -982,8 +938,8 @@ def start_job( job_definition_name: str, **kwargs: Any ) -> _models.JobRunResourceId: - """Requests an Agent to start a new instance of this Job Definition, generating a new Job Run - resource. + """Creates a new Job Run resource for the specified Job Definition and passes it to the Agent for + execution. :param resource_group_name: The name of the resource group. The name is case insensitive. Required. @@ -994,12 +950,11 @@ def start_job( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRunResourceId or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRunResourceId :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1013,23 +968,22 @@ def start_job( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunResourceId] = kwargs.pop("cls", None) - request = build_start_job_request( + _request = build_start_job_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.start_job.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -1042,13 +996,9 @@ def start_job( deserialized = self._deserialize("JobRunResourceId", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - start_job.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/startJob" - } + return deserialized # type: ignore @distributed_trace def stop_job( @@ -1070,12 +1020,11 @@ def stop_job( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRunResourceId or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRunResourceId :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1089,23 +1038,22 @@ def stop_job( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunResourceId] = kwargs.pop("cls", None) - request = build_stop_job_request( + _request = build_stop_job_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.stop_job.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -1118,10 +1066,6 @@ def stop_job( deserialized = self._deserialize("JobRunResourceId", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - stop_job.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/stopJob" - } + return deserialized # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_runs_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_runs_operations.py index 37b731739007..25bc4e3ad243 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_runs_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_job_runs_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 ( @@ -29,6 +30,10 @@ 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 +52,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -88,7 +93,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -157,7 +162,6 @@ def list( :type project_name: str :param job_definition_name: The name of the Job Definition resource. Required. :type job_definition_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either JobRun or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.JobRun] :raises ~azure.core.exceptions.HttpResponseError: @@ -168,7 +172,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRunList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -179,19 +183,18 @@ 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, storage_mover_name=storage_mover_name, project_name=project_name, job_definition_name=job_definition_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -203,13 +206,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("JobRunList", pipeline_response) @@ -219,11 +222,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 @@ -236,10 +239,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/jobRuns" - } - @distributed_trace def get( self, @@ -263,12 +262,11 @@ def get( :type job_definition_name: str :param job_run_name: The name of the Job Run resource. Required. :type job_run_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: JobRun or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.JobRun :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -282,7 +280,7 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.JobRun] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -290,16 +288,15 @@ def get( job_run_name=job_run_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 = _convert_request(_request) + _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 @@ -312,10 +309,6 @@ def get( deserialized = self._deserialize("JobRun", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}/jobDefinitions/{jobDefinitionName}/jobRuns/{jobRunName}" - } + return deserialized # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_operations.py index 91e603f89dbe..695661c464fd 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/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 ( @@ -29,6 +30,10 @@ 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 +45,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,7 +85,6 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: Lists all the supported operations for the Azure Storage Mover REST API. - :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.storagemover.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -91,7 +95,7 @@ def list(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, @@ -102,14 +106,13 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -121,13 +124,13 @@ 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 = _convert_request(_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) @@ -137,11 +140,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 @@ -153,5 +156,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.StorageMover/operations"} diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_projects_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_projects_operations.py index a6ffeb2cd48a..738f5b33ba3f 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_projects_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_projects_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, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -32,6 +33,10 @@ 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]] @@ -45,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +83,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -112,7 +117,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -149,7 +154,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -186,7 +191,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -242,7 +247,6 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Project or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.Project] :raises ~azure.core.exceptions.HttpResponseError: @@ -253,7 +257,7 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ProjectList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -264,17 +268,16 @@ def list(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -286,13 +289,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("ProjectList", pipeline_response) @@ -302,11 +305,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 @@ -319,10 +322,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects" - } - @distributed_trace def get( self, resource_group_name: str, storage_mover_name: str, project_name: str, **kwargs: Any @@ -336,12 +335,11 @@ def get( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -355,22 +353,21 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Project] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_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 = _convert_request(_request) + _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 @@ -383,13 +380,9 @@ def get( deserialized = self._deserialize("Project", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore @overload def create_or_update( @@ -416,7 +409,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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -428,7 +420,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: IO, + project: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -443,11 +435,10 @@ def create_or_update( :param project_name: The name of the Project resource. Required. :type project_name: str :param project: Required. - :type project: IO + :type project: 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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -459,7 +450,7 @@ def create_or_update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: Union[_models.Project, IO], + project: Union[_models.Project, IO[bytes]], **kwargs: Any ) -> _models.Project: """Creates or updates a Project resource, which is a logical grouping of related jobs. @@ -471,17 +462,13 @@ def create_or_update( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :param project: Is either a Project type or a IO type. Required. - :type project: ~azure.mgmt.storagemover.models.Project 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 project: Is either a Project type or a IO[bytes] type. Required. + :type project: ~azure.mgmt.storagemover.models.Project or IO[bytes] :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -504,7 +491,7 @@ def create_or_update( else: _json = self._serialize.body(project, "Project") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -513,16 +500,15 @@ 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 = _convert_request(_request) + _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 @@ -535,13 +521,9 @@ def create_or_update( deserialized = self._deserialize("Project", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore @overload def update( @@ -569,7 +551,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -581,7 +562,7 @@ def update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: IO, + project: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -597,11 +578,10 @@ def update( :param project_name: The name of the Project resource. Required. :type project_name: str :param project: Required. - :type project: IO + :type project: 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: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: @@ -613,7 +593,7 @@ def update( resource_group_name: str, storage_mover_name: str, project_name: str, - project: Union[_models.ProjectUpdateParameters, IO], + project: Union[_models.ProjectUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.Project: """Updates properties for a Project resource. Properties not specified in the request body will be @@ -626,17 +606,13 @@ def update( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_name: str - :param project: Is either a ProjectUpdateParameters type or a IO type. Required. - :type project: ~azure.mgmt.storagemover.models.ProjectUpdateParameters 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 project: Is either a ProjectUpdateParameters type or a IO[bytes] type. Required. + :type project: ~azure.mgmt.storagemover.models.ProjectUpdateParameters or IO[bytes] :return: Project or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.Project :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -659,7 +635,7 @@ def update( else: _json = self._serialize.body(project, "ProjectUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, project_name=project_name, @@ -668,16 +644,15 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -690,18 +665,14 @@ def update( deserialized = self._deserialize("Project", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return deserialized # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, project_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -715,22 +686,21 @@ def _delete_initial( # 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, storage_mover_name=storage_mover_name, project_name=project_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 = _convert_request(_request) + _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 @@ -741,11 +711,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def begin_delete( @@ -760,14 +726,6 @@ def begin_delete( :type storage_mover_name: str :param project_name: The name of the Project resource. Required. :type project_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 +753,7 @@ def begin_delete( 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( @@ -806,14 +764,10 @@ 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.StorageMover/storageMovers/{storageMoverName}/projects/{projectName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_storage_movers_operations.py b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_storage_movers_operations.py index 6dd58544b908..4bf687edc159 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_storage_movers_operations.py +++ b/sdk/storagemover/azure-mgmt-storagemover/azure/mgmt/storagemover/operations/_storage_movers_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, Optional, Type, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -32,6 +33,10 @@ 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]] @@ -43,7 +48,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -67,7 +72,7 @@ def build_list_request(resource_group_name: str, subscription_id: str, **kwargs: _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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +104,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -132,7 +137,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -168,7 +173,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -204,7 +209,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", "2023-10-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -254,7 +259,6 @@ def __init__(self, *args, **kwargs): def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageMover"]: """Lists all Storage Movers in a subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageMover or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.StorageMover] :raises ~azure.core.exceptions.HttpResponseError: @@ -265,7 +269,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageMover" api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMoverList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -276,15 +280,14 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageMover" def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -296,13 +299,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("StorageMoverList", pipeline_response) @@ -312,11 +315,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 @@ -329,10 +332,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageMover/storageMovers" - } - @distributed_trace def list(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.StorageMover"]: """Lists all Storage Movers in a resource group. @@ -340,7 +339,6 @@ def list(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Sto :param resource_group_name: The name of the resource group. The name is case insensitive. Required. :type resource_group_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageMover or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storagemover.models.StorageMover] :raises ~azure.core.exceptions.HttpResponseError: @@ -351,7 +349,7 @@ def list(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Sto api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMoverList] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -362,16 +360,15 @@ def list(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Sto 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, 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -383,13 +380,13 @@ 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 = _convert_request(_request) + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("StorageMoverList", pipeline_response) @@ -399,11 +396,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 @@ -416,10 +413,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers" - } - @distributed_trace def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) -> _models.StorageMover: """Gets a Storage Mover resource. @@ -429,12 +422,11 @@ def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -448,21 +440,20 @@ def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageMover] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_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 = _convert_request(_request) + _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 @@ -475,13 +466,9 @@ def get(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) deserialized = self._deserialize("StorageMover", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore @overload def create_or_update( @@ -505,7 +492,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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -516,7 +502,7 @@ def create_or_update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: IO, + storage_mover: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -529,11 +515,10 @@ def create_or_update( :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str :param storage_mover: Required. - :type storage_mover: IO + :type storage_mover: 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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -544,7 +529,7 @@ def create_or_update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: Union[_models.StorageMover, IO], + storage_mover: Union[_models.StorageMover, IO[bytes]], **kwargs: Any ) -> _models.StorageMover: """Creates or updates a top-level Storage Mover resource. @@ -554,17 +539,13 @@ def create_or_update( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :param storage_mover: Is either a StorageMover type or a IO type. Required. - :type storage_mover: ~azure.mgmt.storagemover.models.StorageMover 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 storage_mover: Is either a StorageMover type or a IO[bytes] type. Required. + :type storage_mover: ~azure.mgmt.storagemover.models.StorageMover or IO[bytes] :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -587,7 +568,7 @@ def create_or_update( else: _json = self._serialize.body(storage_mover, "StorageMover") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, @@ -595,16 +576,15 @@ 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 = _convert_request(_request) + _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 @@ -617,13 +597,9 @@ def create_or_update( deserialized = self._deserialize("StorageMover", pipeline_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/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore @overload def update( @@ -648,7 +624,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -659,7 +634,7 @@ def update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: IO, + storage_mover: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -673,11 +648,10 @@ def update( :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str :param storage_mover: Required. - :type storage_mover: IO + :type storage_mover: 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: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: @@ -688,7 +662,7 @@ def update( self, resource_group_name: str, storage_mover_name: str, - storage_mover: Union[_models.StorageMoverUpdateParameters, IO], + storage_mover: Union[_models.StorageMoverUpdateParameters, IO[bytes]], **kwargs: Any ) -> _models.StorageMover: """Updates properties for a Storage Mover resource. Properties not specified in the request body @@ -699,17 +673,14 @@ def update( :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_name: str - :param storage_mover: Is either a StorageMoverUpdateParameters type or a IO type. Required. - :type storage_mover: ~azure.mgmt.storagemover.models.StorageMoverUpdateParameters 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 storage_mover: Is either a StorageMoverUpdateParameters type or a IO[bytes] type. + Required. + :type storage_mover: ~azure.mgmt.storagemover.models.StorageMoverUpdateParameters or IO[bytes] :return: StorageMover or the result of cls(response) :rtype: ~azure.mgmt.storagemover.models.StorageMover :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -732,7 +703,7 @@ def update( else: _json = self._serialize.body(storage_mover, "StorageMoverUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_mover_name=storage_mover_name, subscription_id=self._config.subscription_id, @@ -740,16 +711,15 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request = _convert_request(_request) + _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 @@ -762,18 +732,14 @@ def update( deserialized = self._deserialize("StorageMover", pipeline_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return deserialized # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, storage_mover_name: str, **kwargs: Any ) -> None: - error_map = { + error_map: MutableMapping[int, Type[HttpResponseError]] = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -787,21 +753,20 @@ def _delete_initial( # 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, storage_mover_name=storage_mover_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 = _convert_request(_request) + _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 @@ -812,11 +777,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageMover/storageMovers/{storageMoverName}" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def begin_delete(self, resource_group_name: str, storage_mover_name: str, **kwargs: Any) -> LROPoller[None]: @@ -827,14 +788,6 @@ def begin_delete(self, resource_group_name: str, storage_mover_name: str, **kwar :type resource_group_name: str :param storage_mover_name: The name of the Storage Mover resource. Required. :type storage_mover_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: @@ -861,7 +814,7 @@ def begin_delete(self, resource_group_name: str, storage_mover_name: str, **kwar 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( @@ -872,14 +825,10 @@ 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.StorageMover/storageMovers/{storageMoverName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_maximum_set.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_maximum_set.py new file mode 100644 index 000000000000..3f415eeea484 --- /dev/null +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_maximum_set.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, IO, Union + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.storagemover import StorageMoverMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-storagemover +# USAGE + python agents_create_or_update_maximum_set.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = StorageMoverMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="60bcfc77-6589-4da2-b7fd-f9ec9322cf95", + ) + + response = client.agents.create_or_update( + resource_group_name="examples-rg", + storage_mover_name="examples-storageMoverName", + agent_name="examples-agentName", + agent={ + "properties": { + "arcResourceId": "/subscriptions/60bcfc77-6589-4da2-b7fd-f9ec9322cf95/resourceGroups/examples-rg/providers/Microsoft.HybridCompute/machines/examples-hybridComputeName", + "arcVmUuid": "3bb2c024-eba9-4d18-9e7a-1d772fcc5fe9", + "description": "Example Agent Description", + "uploadLimitSchedule": { + "weeklyRecurrences": [ + { + "days": ["Monday"], + "endTime": {"hour": 18, "minute": 30}, + "limitInMbps": 2000, + "startTime": {"hour": 9, "minute": 0}, + } + ] + }, + } + }, + ) + print(response) + + +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_CreateOrUpdate_MaximumSet.json +if __name__ == "__main__": + main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_minimum_set.py similarity index 91% rename from sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update.py rename to sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_minimum_set.py index ce4dbf03de13..9a4c3f3d1bb8 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_minimum_set.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -14,7 +17,7 @@ pip install azure-identity pip install azure-mgmt-storagemover # USAGE - python agents_create_or_update.py + python agents_create_or_update_minimum_set.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -37,13 +40,12 @@ def main(): "properties": { "arcResourceId": "/subscriptions/60bcfc77-6589-4da2-b7fd-f9ec9322cf95/resourceGroups/examples-rg/providers/Microsoft.HybridCompute/machines/examples-hybridComputeName", "arcVmUuid": "3bb2c024-eba9-4d18-9e7a-1d772fcc5fe9", - "description": "Example Agent Description", } }, ) print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Agents_CreateOrUpdate.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_CreateOrUpdate_MinimumSet.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_upload_limit_schedule_overnight.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_upload_limit_schedule_overnight.py new file mode 100644 index 000000000000..7c2f6e1c38ed --- /dev/null +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_create_or_update_upload_limit_schedule_overnight.py @@ -0,0 +1,67 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, IO, Union + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.storagemover import StorageMoverMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-storagemover +# USAGE + python agents_create_or_update_upload_limit_schedule_overnight.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = StorageMoverMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="60bcfc77-6589-4da2-b7fd-f9ec9322cf95", + ) + + response = client.agents.create_or_update( + resource_group_name="examples-rg", + storage_mover_name="examples-storageMoverName", + agent_name="examples-agentName", + agent={ + "properties": { + "arcResourceId": "/subscriptions/60bcfc77-6589-4da2-b7fd-f9ec9322cf95/resourceGroups/examples-rg/providers/Microsoft.HybridCompute/machines/examples-hybridComputeName", + "arcVmUuid": "3bb2c024-eba9-4d18-9e7a-1d772fcc5fe9", + "uploadLimitSchedule": { + "weeklyRecurrences": [ + { + "days": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + "endTime": {"hour": 24, "minute": 0}, + "limitInMbps": 2000, + "startTime": {"hour": 18, "minute": 0}, + }, + { + "days": ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + "endTime": {"hour": 9, "minute": 0}, + "limitInMbps": 2000, + "startTime": {"hour": 0, "minute": 0}, + }, + ] + }, + } + }, + ) + print(response) + + +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_CreateOrUpdate_UploadLimitSchedule_Overnight.json +if __name__ == "__main__": + main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_delete.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_delete.py index 1445bf127064..d21358e70f6d 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_delete.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Agents_Delete.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_Delete.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_maximum_set.py similarity index 92% rename from sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get.py rename to sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_maximum_set.py index 5f1af83534cd..a03f350a26c6 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_maximum_set.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -14,7 +15,7 @@ pip install azure-identity pip install azure-mgmt-storagemover # USAGE - python agents_get.py + python agents_get_maximum_set.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Agents_Get.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_Get_MaximumSet.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_minimum_set.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_minimum_set.py new file mode 100644 index 000000000000..017cfa1806d6 --- /dev/null +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_get_minimum_set.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. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.storagemover import StorageMoverMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-storagemover +# USAGE + python agents_get_minimum_set.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = StorageMoverMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="60bcfc77-6589-4da2-b7fd-f9ec9322cf95", + ) + + response = client.agents.get( + resource_group_name="examples-rg", + storage_mover_name="examples-storageMoverName", + agent_name="examples-agentName", + ) + print(response) + + +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_Get_MinimumSet.json +if __name__ == "__main__": + main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_maximum_set.py similarity index 92% rename from sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list.py rename to sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_maximum_set.py index f108c98f0577..6c5357bc3c21 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_maximum_set.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -14,7 +15,7 @@ pip install azure-identity pip install azure-mgmt-storagemover # USAGE - python agents_list.py + python agents_list_maximum_set.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Agents_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_List_MaximumSet.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_minimum_set.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_minimum_set.py new file mode 100644 index 000000000000..58a743a3a044 --- /dev/null +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_list_minimum_set.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. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.storagemover import StorageMoverMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-storagemover +# USAGE + python agents_list_minimum_set.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = StorageMoverMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="60bcfc77-6589-4da2-b7fd-f9ec9322cf95", + ) + + response = client.agents.list( + resource_group_name="examples-rg", + storage_mover_name="examples-storageMoverName", + ) + for item in response: + print(item) + + +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_List_MinimumSet.json +if __name__ == "__main__": + main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_update.py index 0fd6f2b48e32..a1ad905d1596 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/agents_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -33,11 +36,25 @@ def main(): resource_group_name="examples-rg", storage_mover_name="examples-storageMoverName", agent_name="examples-agentName", - agent={"properties": {"description": "Updated Agent Description"}}, + agent={ + "properties": { + "description": "Example Agent Description", + "uploadLimitSchedule": { + "weeklyRecurrences": [ + { + "days": ["Monday"], + "endTime": {"hour": 18, "minute": 30}, + "limitInMbps": 2000, + "startTime": {"hour": 9, "minute": 0}, + } + ] + }, + } + }, ) print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Agents_Update.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Agents_Update.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_blob_container.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_blob_container.py index 52c8188ed0d3..c25faab44361 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_blob_container.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_blob_container.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -45,6 +48,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_CreateOrUpdate_AzureStorageBlobContainer.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_CreateOrUpdate_AzureStorageBlobContainer.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_smb_file_share.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_smb_file_share.py index 25e7a5e3a8cb..2a8f64abd33b 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_smb_file_share.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_azure_storage_smb_file_share.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -45,6 +48,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_CreateOrUpdate_AzureStorageSmbFileShare.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_CreateOrUpdate_AzureStorageSmbFileShare.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_nfs_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_nfs_mount.py index 853d8fb52ec3..b746dd8e072e 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_nfs_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_nfs_mount.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -45,6 +48,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_CreateOrUpdate_NfsMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_CreateOrUpdate_NfsMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_smb_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_smb_mount.py index 7f11bce724c0..88e6c1989670 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_smb_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_create_or_update_smb_mount.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -50,6 +53,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_CreateOrUpdate_SmbMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_CreateOrUpdate_SmbMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_delete.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_delete.py index 812f4dc7f32b..c026ca605f83 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_delete.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Delete.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Delete.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_blob_container.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_blob_container.py index 3a48f7ffad5a..266827d9daca 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_blob_container.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_blob_container.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Get_AzureStorageBlobContainer.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Get_AzureStorageBlobContainer.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_smb_file_share.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_smb_file_share.py index 333b9dc3b215..93d2e01760ac 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_smb_file_share.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_azure_storage_smb_file_share.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Get_AzureStorageSmbFileShare.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Get_AzureStorageSmbFileShare.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_nfs_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_nfs_mount.py index bd3b094a62fb..e07a4cb1ffd6 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_nfs_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_nfs_mount.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Get_NfsMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Get_NfsMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_smb_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_smb_mount.py index 915c0b7e0a72..8f87d3640b91 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_smb_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_get_smb_mount.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Get_SmbMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Get_SmbMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_list.py index 14ee11b4cefa..e85317d11043 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_blob_container.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_blob_container.py index 537de4a2dbd0..b9df6c131ec7 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_blob_container.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_blob_container.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -40,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Update_AzureStorageBlobContainer.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Update_AzureStorageBlobContainer.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_smb_file_share.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_smb_file_share.py index a0797fb2d577..80df27cce4f1 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_smb_file_share.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_azure_storage_smb_file_share.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -40,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Update_AzureStorageSmbFileShare.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Update_AzureStorageSmbFileShare.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_nfs_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_nfs_mount.py index dee810aa2d44..3e7e7700efdd 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_nfs_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_nfs_mount.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +41,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Update_NfsMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Update_NfsMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_smb_mount.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_smb_mount.py index 73fffdf9bc87..4f076bc0f0b4 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_smb_mount.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/endpoints_update_smb_mount.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -48,6 +51,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Endpoints_Update_SmbMount.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Endpoints_Update_SmbMount.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_create_or_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_create_or_update.py index a45f5af8abd2..dd891e2809c1 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_create_or_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_create_or_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -49,6 +52,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_CreateOrUpdate.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_delete.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_delete.py index 3de34d05d308..b8c12950fec9 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_delete.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): ).result() -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_Delete.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_Delete.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_get.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_get.py index 1713f0eecb1a..176e99f8a9cc 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_get.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_Get.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_Get.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_list.py index 8e50be480111..8be0ee9fa157 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_start_job.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_start_job.py index 3ad6e6dd3ba3..a095d18c47ad 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_start_job.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_start_job.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_StartJob.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_StartJob.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_stop_job.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_stop_job.py index 53e60c14f513..770fa49dd598 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_stop_job.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_stop_job.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_StopJob.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_StopJob.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_update.py index 236c6d24f233..d017696ba651 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_definitions_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -41,6 +44,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobDefinitions_Update.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobDefinitions_Update.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_get.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_get.py index 1860ca06e72a..a303d178260d 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_get.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -39,6 +40,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobRuns_Get.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobRuns_Get.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_list.py index ebdb2ec082d1..25bca88c3a31 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/job_runs_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -39,6 +40,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/JobRuns_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/JobRuns_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/operations_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/operations_list.py index 42646d0fa951..b007a233d359 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/operations_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/operations_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Operations_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Operations_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_create_or_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_create_or_update.py index 7ff659bf5391..82ceb39f66fa 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_create_or_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_create_or_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +41,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Projects_CreateOrUpdate.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Projects_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_delete.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_delete.py index 64fcbbb20e15..e03490f7d7d6 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_delete.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Projects_Delete.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Projects_Delete.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_get.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_get.py index be3e007911e3..527989a1ed82 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_get.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Projects_Get.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Projects_Get.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_list.py index 1cfe40fc473f..afe451982b65 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Projects_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Projects_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_update.py index 846a20283d08..a02b3be987fb 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/projects_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -38,6 +41,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/Projects_Update.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/Projects_Update.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_create_or_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_create_or_update.py index ceaf12c6fd02..b2ba7418ea8c 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_create_or_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_create_or_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -41,6 +44,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_CreateOrUpdate.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_delete.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_delete.py index 27cc501b62ff..ef01088af2e1 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_delete.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -35,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_Delete.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_Delete.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_get.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_get.py index 03a9ef464b50..bd826f582ea9 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_get.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_Get.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_Get.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list.py index d445dbf6ff85..97b7eeb66196 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_List.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_List.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list_by_subscription.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list_by_subscription.py index 1578b3a196a3..417546076ed3 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list_by_subscription.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_list_by_subscription.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_ListBySubscription.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_ListBySubscription.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_update.py b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_update.py index 25068bfbbdf2..7f59d547ad68 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_update.py +++ b/sdk/storagemover/azure-mgmt-storagemover/generated_samples/storage_movers_update.py @@ -6,7 +6,10 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import Any, IO, Union + from azure.identity import DefaultAzureCredential + from azure.mgmt.storagemover import StorageMoverMgmtClient """ @@ -37,6 +40,6 @@ def main(): print(response) -# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2023-10-01/examples/StorageMovers_Update.json +# x-ms-original-file: specification/storagemover/resource-manager/Microsoft.StorageMover/stable/2024-07-01/examples/StorageMovers_Update.json if __name__ == "__main__": main() diff --git a/sdk/storagemover/azure-mgmt-storagemover/setup.py b/sdk/storagemover/azure-mgmt-storagemover/setup.py index ee8acc59dca9..6c6dbefce51e 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/setup.py +++ b/sdk/storagemover/azure-mgmt-storagemover/setup.py @@ -53,11 +53,11 @@ "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: MIT License", ], zip_safe=False, @@ -74,10 +74,9 @@ "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", - "typing-extensions>=4.3.0; python_version<'3.8.0'", + "isodate>=0.6.1", + "azure-common>=1.1", + "azure-mgmt-core>=1.3.2", ], - python_requires=">=3.7", + python_requires=">=3.8", ) From 3e8ca67c38665798533cb6e3ef5e9cff0db54b07 Mon Sep 17 00:00:00 2001 From: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:14:51 +0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md b/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md index 5eece2c6b0f4..4a83763553bd 100644 --- a/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md +++ b/sdk/storagemover/azure-mgmt-storagemover/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 2.1.0 (2024-07-22) +## 2.1.0 (2024-06-17) ### Features Added