CodeGen from PR 25332 in Azure/azure-rest-api-specs

Merge abcf51bed967af4f3564e684a3fad48dad3bfe61 into 0689d8abd87491083134cf67f90d2e57778b2214

sdk/netapp/azure-mgmt-netapp/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "9aec843715b0bc99bef5bd26f50939ddc3f7b632",
+  "commit": "9b4ddc89b216b572c92fe7773c5927cfebf292a6",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.6.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/netapp/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.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/netapp/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
   "readme": "specification/netapp/resource-manager/readme.md"
 }

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_configuration.py

@@ -29,14 +29,14 @@ class NetAppManagementClientConfiguration(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 "2022-11-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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(NetAppManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2022-11-01")
+        api_version: str = kwargs.pop("api_version", "2023-05-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_net_app_management_client.py

@@ -16,7 +16,6 @@
 from ._configuration import NetAppManagementClientConfiguration
 from ._serialization import Deserializer, Serializer
 from .operations import (
-    AccountBackupsOperations,
     AccountsOperations,
     BackupPoliciesOperations,
     BackupsOperations,
@@ -59,8 +58,6 @@ class NetAppManagementClient:  # pylint: disable=client-accepts-api-version-keyw
     :vartype snapshot_policies: azure.mgmt.netapp.operations.SnapshotPoliciesOperations
     :ivar backups: BackupsOperations operations
     :vartype backups: azure.mgmt.netapp.operations.BackupsOperations
-    :ivar account_backups: AccountBackupsOperations operations
-    :vartype account_backups: azure.mgmt.netapp.operations.AccountBackupsOperations
     :ivar backup_policies: BackupPoliciesOperations operations
     :vartype backup_policies: azure.mgmt.netapp.operations.BackupPoliciesOperations
     :ivar volume_quota_rules: VolumeQuotaRulesOperations operations
@@ -75,7 +72,7 @@ class NetAppManagementClient:  # 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 "2022-11-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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
@@ -111,7 +108,6 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.backups = BackupsOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.account_backups = AccountBackupsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.backup_policies = BackupPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.volume_quota_rules = VolumeQuotaRulesOperations(
             self._client, self._config, self._serialize, self._deserialize

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_serialization.py

@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
 
         :param data: The data to be serialized.
         :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
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get("skip_quote", False)
+                return str(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)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_vendor.py

@@ -5,8 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import List, cast
-
 from azure.core.pipeline.transport import HttpRequest
 
 
@@ -16,15 +14,3 @@ def _convert_request(request, files=None):
     if files:
         request.set_formdata_body(files)
     return request
-
-
-def _format_url_section(template, **kwargs):
-    components = template.split("/")
-    while components:
-        try:
-            return template.format(**kwargs)
-        except KeyError as key:
-            # Need the cast, as for some reasons "split" is typed as list[str | Any]
-            formatted_components = cast(List[str], template.split("/"))
-            components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.1.0"
+VERSION = "5.1.0"

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/aio/_configuration.py

@@ -29,14 +29,14 @@ class NetAppManagementClientConfiguration(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 "2022-11-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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(NetAppManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2022-11-01")
+        api_version: str = kwargs.pop("api_version", "2023-05-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/aio/_net_app_management_client.py

@@ -16,7 +16,6 @@
 from .._serialization import Deserializer, Serializer
 from ._configuration import NetAppManagementClientConfiguration
 from .operations import (
-    AccountBackupsOperations,
     AccountsOperations,
     BackupPoliciesOperations,
     BackupsOperations,
@@ -59,8 +58,6 @@ class NetAppManagementClient:  # pylint: disable=client-accepts-api-version-keyw
     :vartype snapshot_policies: azure.mgmt.netapp.aio.operations.SnapshotPoliciesOperations
     :ivar backups: BackupsOperations operations
     :vartype backups: azure.mgmt.netapp.aio.operations.BackupsOperations
-    :ivar account_backups: AccountBackupsOperations operations
-    :vartype account_backups: azure.mgmt.netapp.aio.operations.AccountBackupsOperations
     :ivar backup_policies: BackupPoliciesOperations operations
     :vartype backup_policies: azure.mgmt.netapp.aio.operations.BackupPoliciesOperations
     :ivar volume_quota_rules: VolumeQuotaRulesOperations operations
@@ -75,7 +72,7 @@ class NetAppManagementClient:  # 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 "2022-11-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-05-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
@@ -111,7 +108,6 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.backups = BackupsOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.account_backups = AccountBackupsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.backup_policies = BackupPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.volume_quota_rules = VolumeQuotaRulesOperations(
             self._client, self._config, self._serialize, self._deserialize

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/aio/operations/__init__.py

@@ -15,7 +15,6 @@
 from ._snapshots_operations import SnapshotsOperations
 from ._snapshot_policies_operations import SnapshotPoliciesOperations
 from ._backups_operations import BackupsOperations
-from ._account_backups_operations import AccountBackupsOperations
 from ._backup_policies_operations import BackupPoliciesOperations
 from ._volume_quota_rules_operations import VolumeQuotaRulesOperations
 from ._volume_groups_operations import VolumeGroupsOperations
@@ -35,7 +34,6 @@
     "SnapshotsOperations",
     "SnapshotPoliciesOperations",
     "BackupsOperations",
-    "AccountBackupsOperations",
     "BackupPoliciesOperations",
     "VolumeQuotaRulesOperations",
     "VolumeGroupsOperations",