diff --git a/sdk/elastic/azure-mgmt-elastic/_meta.json b/sdk/elastic/azure-mgmt-elastic/_meta.json
index 0823592354b..fe5ab6a4db3 100644
--- a/sdk/elastic/azure-mgmt-elastic/_meta.json
+++ b/sdk/elastic/azure-mgmt-elastic/_meta.json
@@ -1,11 +1,11 @@
 {
-  "commit": "6c709e5a3325eaa862649acee2252ce1c8166042",
+  "commit": "1d5c026560a8fe7fc6835b1748ec919aa1b09604",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.19.0",
+    "@autorest/python@6.27.4",
     "@autorest/modelerfour@4.27.0"
   ],
-  "autorest_command": "autorest specification/elastic/resource-manager/readme.md --generate-sample=True --generate-test=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.19.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/elastic/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/elastic/resource-manager/readme.md"
 }
\ No newline at end of file
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/__init__.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/__init__.py
index a9ab412a5f8..5f4526be9b3 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/__init__.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/__init__.py
@@ -5,15 +5,21 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._microsoft_elastic import MicrosoftElastic
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._microsoft_elastic import MicrosoftElastic  # type: ignore
 from ._version import VERSION
 
 __version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
@@ -21,6 +27,6 @@
 __all__ = [
     "MicrosoftElastic",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_configuration.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_configuration.py
index 7e7a23a868b..fd9667dd2d2 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_configuration.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_configuration.py
@@ -14,11 +14,10 @@
 from ._version import VERSION
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for MicrosoftElastic.
 
     Note that all parameters used to create this instance are saved as instance
@@ -28,13 +27,13 @@ class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attrib
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2024-06-15-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2025-01-15-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
-        api_version: str = kwargs.pop("api_version", "2024-06-15-preview")
+        api_version: str = kwargs.pop("api_version", "2025-01-15-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_microsoft_elastic.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_microsoft_elastic.py
index 80947d3c4e9..672bfea71f0 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_microsoft_elastic.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_microsoft_elastic.py
@@ -47,11 +47,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class MicrosoftElastic:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class MicrosoftElastic:  # pylint: disable=too-many-instance-attributes
     """MicrosoftElastic.
 
     :ivar operations: Operations operations
@@ -117,7 +116,7 @@ class MicrosoftElastic:  # pylint: disable=client-accepts-api-version-keyword,to
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2024-06-15-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2025-01-15-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_serialization.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_serialization.py
index 8139854b97b..b24ab288545 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_serialization.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_serialization.py
@@ -1,3 +1,4 @@
+# pylint: disable=too-many-lines
 # --------------------------------------------------------------------------
 #
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -24,7 +25,6 @@
 #
 # --------------------------------------------------------------------------
 
-# pylint: skip-file
 # pyright: reportUnnecessaryTypeIgnoreComment=false
 
 from base64 import b64decode, b64encode
@@ -52,7 +52,6 @@
     MutableMapping,
     Type,
     List,
-    Mapping,
 )
 
 try:
@@ -91,6 +90,8 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type:
         :param data: Input, could be bytes or stream (will be decoded with UTF8) or text
         :type data: str or bytes or IO
         :param str content_type: The content type.
+        :return: The deserialized data.
+        :rtype: object
         """
         if hasattr(data, "read"):
             # Assume a stream
@@ -112,7 +113,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type:
             try:
                 return json.loads(data_as_str)
             except ValueError as err:
-                raise DeserializationError("JSON is invalid: {}".format(err), err)
+                raise DeserializationError("JSON is invalid: {}".format(err), err) from err
         elif "xml" in (content_type or []):
             try:
 
@@ -155,6 +156,11 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]],
         Use bytes and headers to NOT use any requests/aiohttp or whatever
         specific implementation.
         Headers will tested for "content-type"
+
+        :param bytes body_bytes: The body of the response.
+        :param dict headers: The headers of the response.
+        :returns: The deserialized data.
+        :rtype: object
         """
         # Try to use content-type from headers if available
         content_type = None
@@ -184,15 +190,30 @@ class UTC(datetime.tzinfo):
     """Time Zone info for handling UTC"""
 
     def utcoffset(self, dt):
-        """UTF offset for UTC is 0."""
+        """UTF offset for UTC is 0.
+
+        :param datetime.datetime dt: The datetime
+        :returns: The offset
+        :rtype: datetime.timedelta
+        """
         return datetime.timedelta(0)
 
     def tzname(self, dt):
-        """Timestamp representation."""
+        """Timestamp representation.
+
+        :param datetime.datetime dt: The datetime
+        :returns: The timestamp representation
+        :rtype: str
+        """
         return "Z"
 
     def dst(self, dt):
-        """No daylight saving for UTC."""
+        """No daylight saving for UTC.
+
+        :param datetime.datetime dt: The datetime
+        :returns: The daylight saving time
+        :rtype: datetime.timedelta
+        """
         return datetime.timedelta(hours=1)
 
 
@@ -206,7 +227,7 @@ class _FixedOffset(datetime.tzinfo):  # type: ignore
         :param datetime.timedelta offset: offset in timedelta format
         """
 
-        def __init__(self, offset):
+        def __init__(self, offset) -> None:
             self.__offset = offset
 
         def utcoffset(self, dt):
@@ -235,24 +256,26 @@ def __getinitargs__(self):
 _FLATTEN = re.compile(r"(?<!\\)\.")
 
 
-def attribute_transformer(key, attr_desc, value):
+def attribute_transformer(key, attr_desc, value):  # pylint: disable=unused-argument
     """A key transformer that returns the Python attribute.
 
     :param str key: The attribute name
     :param dict attr_desc: The attribute metadata
     :param object value: The value
     :returns: A key using attribute name
+    :rtype: str
     """
     return (key, value)
 
 
-def full_restapi_key_transformer(key, attr_desc, value):
+def full_restapi_key_transformer(key, attr_desc, value):  # pylint: disable=unused-argument
     """A key transformer that returns the full RestAPI key path.
 
-    :param str _: The attribute name
+    :param str key: The attribute name
     :param dict attr_desc: The attribute metadata
     :param object value: The value
     :returns: A list of keys using RestAPI syntax.
+    :rtype: list
     """
     keys = _FLATTEN.split(attr_desc["key"])
     return ([_decode_attribute_map_key(k) for k in keys], value)
@@ -265,22 +288,29 @@ def last_restapi_key_transformer(key, attr_desc, value):
     :param dict attr_desc: The attribute metadata
     :param object value: The value
     :returns: The last RestAPI key.
+    :rtype: str
     """
     key, value = full_restapi_key_transformer(key, attr_desc, value)
     return (key[-1], value)
 
 
 def _create_xml_node(tag, prefix=None, ns=None):
-    """Create a XML node."""
+    """Create a XML node.
+
+    :param str tag: The tag name
+    :param str prefix: The prefix
+    :param str ns: The namespace
+    :return: The XML node
+    :rtype: xml.etree.ElementTree.Element
+    """
     if prefix and ns:
         ET.register_namespace(prefix, ns)
     if ns:
         return ET.Element("{" + ns + "}" + tag)
-    else:
-        return ET.Element(tag)
+    return ET.Element(tag)
 
 
-class Model(object):
+class Model:
     """Mixin for all client request body/response body models to support
     serialization and deserialization.
     """
@@ -291,7 +321,7 @@ class Model(object):
 
     def __init__(self, **kwargs: Any) -> None:
         self.additional_properties: Optional[Dict[str, Any]] = {}
-        for k in kwargs:
+        for k in kwargs:  # pylint: disable=consider-using-dict-items
             if k not in self._attribute_map:
                 _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
             elif k in self._validation and self._validation[k].get("readonly", False):
@@ -300,13 +330,23 @@ def __init__(self, **kwargs: Any) -> None:
                 setattr(self, k, kwargs[k])
 
     def __eq__(self, other: Any) -> bool:
-        """Compare objects by comparing all attributes."""
+        """Compare objects by comparing all attributes.
+
+        :param object other: The object to compare
+        :returns: True if objects are equal
+        :rtype: bool
+        """
         if isinstance(other, self.__class__):
             return self.__dict__ == other.__dict__
         return False
 
     def __ne__(self, other: Any) -> bool:
-        """Compare objects by comparing all attributes."""
+        """Compare objects by comparing all attributes.
+
+        :param object other: The object to compare
+        :returns: True if objects are not equal
+        :rtype: bool
+        """
         return not self.__eq__(other)
 
     def __str__(self) -> str:
@@ -326,7 +366,11 @@ def is_xml_model(cls) -> bool:
 
     @classmethod
     def _create_xml_node(cls):
-        """Create XML node."""
+        """Create XML node.
+
+        :returns: The XML node
+        :rtype: xml.etree.ElementTree.Element
+        """
         try:
             xml_map = cls._xml_map  # type: ignore
         except AttributeError:
@@ -346,7 +390,9 @@ 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)  # type: ignore
+        return serializer._serialize(  # type: ignore # pylint: disable=protected-access
+            self, keep_readonly=keep_readonly, **kwargs
+        )
 
     def as_dict(
         self,
@@ -380,12 +426,15 @@ def my_key_transformer(key, attr_desc, value):
 
         If you want XML serialization, you can pass the kwargs is_xml=True.
 
+        :param bool keep_readonly: If you want to serialize the readonly attributes
         :param function key_transformer: A key transformer function.
         :returns: A dict JSON compatible object
         :rtype: dict
         """
         serializer = Serializer(self._infer_class_models())
-        return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs)  # type: ignore
+        return serializer._serialize(  # type: ignore # pylint: disable=protected-access
+            self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs
+        )
 
     @classmethod
     def _infer_class_models(cls):
@@ -395,7 +444,7 @@ def _infer_class_models(cls):
             client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
             if cls.__name__ not in client_models:
                 raise ValueError("Not Autorest generated code")
-        except Exception:
+        except Exception:  # pylint: disable=broad-exception-caught
             # Assume it's not Autorest generated (tests?). Add ourselves as dependencies.
             client_models = {cls.__name__: cls}
         return client_models
@@ -408,6 +457,7 @@ def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = N
         :param str content_type: JSON by default, set application/xml if XML.
         :returns: An instance of this model
         :raises: DeserializationError if something went wrong
+        :rtype: ModelType
         """
         deserializer = Deserializer(cls._infer_class_models())
         return deserializer(cls.__name__, data, content_type=content_type)  # type: ignore
@@ -426,9 +476,11 @@ def from_dict(
         and last_rest_key_case_insensitive_extractor)
 
         :param dict data: A dict using RestAPI structure
+        :param function key_extractors: A key extractor function.
         :param str content_type: JSON by default, set application/xml if XML.
         :returns: An instance of this model
         :raises: DeserializationError if something went wrong
+        :rtype: ModelType
         """
         deserializer = Deserializer(cls._infer_class_models())
         deserializer.key_extractors = (  # type: ignore
@@ -448,21 +500,25 @@ def _flatten_subtype(cls, key, objects):
             return {}
         result = dict(cls._subtype_map[key])
         for valuetype in cls._subtype_map[key].values():
-            result.update(objects[valuetype]._flatten_subtype(key, objects))
+            result.update(objects[valuetype]._flatten_subtype(key, objects))  # pylint: disable=protected-access
         return result
 
     @classmethod
     def _classify(cls, response, objects):
         """Check the class _subtype_map for any child classes.
         We want to ignore any inherited _subtype_maps.
-        Remove the polymorphic key from the initial data.
+
+        :param dict response: The initial data
+        :param dict objects: The class objects
+        :returns: The class to be used
+        :rtype: class
         """
         for subtype_key in cls.__dict__.get("_subtype_map", {}).keys():
             subtype_value = None
 
             if not isinstance(response, ET.Element):
                 rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1]
-                subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None)
+                subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None)
             else:
                 subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response)
             if subtype_value:
@@ -501,11 +557,13 @@ def _decode_attribute_map_key(key):
     inside the received data.
 
     :param str key: A key string from the generated code
+    :returns: The decoded key
+    :rtype: str
     """
     return key.replace("\\.", ".")
 
 
-class Serializer(object):
+class Serializer:  # pylint: disable=too-many-public-methods
     """Request object model serializer."""
 
     basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
@@ -540,7 +598,7 @@ class Serializer(object):
         "multiple": lambda x, y: x % y != 0,
     }
 
-    def __init__(self, classes: Optional[Mapping[str, type]] = None):
+    def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
         self.serialize_type = {
             "iso-8601": Serializer.serialize_iso,
             "rfc-1123": Serializer.serialize_rfc,
@@ -560,13 +618,16 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None):
         self.key_transformer = full_restapi_key_transformer
         self.client_side_validation = True
 
-    def _serialize(self, target_obj, data_type=None, **kwargs):
+    def _serialize(  # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals
+        self, target_obj, data_type=None, **kwargs
+    ):
         """Serialize data into a string according to type.
 
-        :param target_obj: The data to be serialized.
+        :param object target_obj: The data to be serialized.
         :param str data_type: The type to be serialized from.
         :rtype: str, dict
         :raises: SerializationError if serialization fails.
+        :returns: The serialized data.
         """
         key_transformer = kwargs.get("key_transformer", self.key_transformer)
         keep_readonly = kwargs.get("keep_readonly", False)
@@ -592,12 +653,14 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
 
         serialized = {}
         if is_xml_model_serialization:
-            serialized = target_obj._create_xml_node()
+            serialized = target_obj._create_xml_node()  # pylint: disable=protected-access
         try:
-            attributes = target_obj._attribute_map
+            attributes = target_obj._attribute_map  # pylint: disable=protected-access
             for attr, attr_desc in attributes.items():
                 attr_name = attr
-                if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False):
+                if not keep_readonly and target_obj._validation.get(  # pylint: disable=protected-access
+                    attr_name, {}
+                ).get("readonly", False):
                     continue
 
                 if attr_name == "additional_properties" and attr_desc["key"] == "":
@@ -633,7 +696,8 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                         if isinstance(new_attr, list):
                             serialized.extend(new_attr)  # type: ignore
                         elif isinstance(new_attr, ET.Element):
-                            # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces.
+                            # If the down XML has no XML/Name,
+                            # we MUST replace the tag with the local tag. But keeping the namespaces.
                             if "name" not in getattr(orig_attr, "_xml_map", {}):
                                 splitted_tag = new_attr.tag.split("}")
                                 if len(splitted_tag) == 2:  # Namespace
@@ -664,17 +728,17 @@ 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 SerializationError(msg) from err
-        else:
-            return serialized
+        return serialized
 
     def body(self, data, data_type, **kwargs):
         """Serialize data intended for a request body.
 
-        :param data: The data to be serialized.
+        :param object data: The data to be serialized.
         :param str data_type: The type to be serialized from.
         :rtype: dict
         :raises: SerializationError if serialization fails.
         :raises: ValueError if data is None
+        :returns: The serialized request body
         """
 
         # Just in case this is a dict
@@ -703,7 +767,7 @@ def body(self, data, data_type, **kwargs):
                         attribute_key_case_insensitive_extractor,
                         last_rest_key_case_insensitive_extractor,
                     ]
-                data = deserializer._deserialize(data_type, data)
+                data = deserializer._deserialize(data_type, data)  # pylint: disable=protected-access
             except DeserializationError as err:
                 raise SerializationError("Unable to build a model: " + str(err)) from err
 
@@ -712,9 +776,11 @@ def body(self, data, data_type, **kwargs):
     def url(self, name, data, data_type, **kwargs):
         """Serialize data intended for a URL path.
 
-        :param data: The data to be serialized.
+        :param str name: The name of the URL path parameter.
+        :param object data: The data to be serialized.
         :param str data_type: The type to be serialized from.
         :rtype: str
+        :returns: The serialized URL path
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
         """
@@ -728,21 +794,20 @@ def url(self, name, data, data_type, **kwargs):
                 output = output.replace("{", quote("{")).replace("}", quote("}"))
             else:
                 output = quote(str(output), safe="")
-        except SerializationError:
-            raise TypeError("{} must be type {}.".format(name, data_type))
-        else:
-            return output
+        except SerializationError as exc:
+            raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+        return output
 
     def query(self, name, data, data_type, **kwargs):
         """Serialize data intended for a URL query.
 
-        :param data: The data to be serialized.
+        :param str name: The name of the query parameter.
+        :param object data: The data to be serialized.
         :param str data_type: The type to be serialized from.
-        :keyword bool skip_quote: Whether to skip quote the serialized result.
-        Defaults to False.
         :rtype: str, list
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
+        :returns: The serialized query parameter
         """
         try:
             # Treat the list aside, since we don't want to encode the div separator
@@ -759,19 +824,20 @@ def query(self, name, data, data_type, **kwargs):
                 output = str(output)
             else:
                 output = quote(str(output), safe="")
-        except SerializationError:
-            raise TypeError("{} must be type {}.".format(name, data_type))
-        else:
-            return str(output)
+        except SerializationError as exc:
+            raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+        return str(output)
 
     def header(self, name, data, data_type, **kwargs):
         """Serialize data intended for a request header.
 
-        :param data: The data to be serialized.
+        :param str name: The name of the header.
+        :param object data: The data to be serialized.
         :param str data_type: The type to be serialized from.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
+        :returns: The serialized header
         """
         try:
             if data_type in ["[str]"]:
@@ -780,21 +846,20 @@ def header(self, name, data, data_type, **kwargs):
             output = self.serialize_data(data, data_type, **kwargs)
             if data_type == "bool":
                 output = json.dumps(output)
-        except SerializationError:
-            raise TypeError("{} must be type {}.".format(name, data_type))
-        else:
-            return str(output)
+        except SerializationError as exc:
+            raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+        return str(output)
 
     def serialize_data(self, data, data_type, **kwargs):
         """Serialize generic data according to supplied data type.
 
-        :param data: The data to be serialized.
+        :param object data: The data to be serialized.
         :param str data_type: The type to be serialized from.
-        :param bool required: Whether it's essential that the data not be
-         empty or None
         :raises: AttributeError if required data is None.
         :raises: ValueError if data is None
         :raises: SerializationError if serialization fails.
+        :returns: The serialized data.
+        :rtype: str, int, float, bool, dict, list
         """
         if data is None:
             raise ValueError("No value for given attribute")
@@ -805,7 +870,7 @@ def serialize_data(self, data, data_type, **kwargs):
             if data_type in self.basic_types.values():
                 return self.serialize_basic(data, data_type, **kwargs)
 
-            elif data_type in self.serialize_type:
+            if data_type in self.serialize_type:
                 return self.serialize_type[data_type](data, **kwargs)
 
             # If dependencies is empty, try with current data class
@@ -821,11 +886,10 @@ def serialize_data(self, data, data_type, **kwargs):
         except (ValueError, TypeError) as err:
             msg = "Unable to serialize value: {!r} as type: {!r}."
             raise SerializationError(msg.format(data, data_type)) from err
-        else:
-            return self._serialize(data, **kwargs)
+        return self._serialize(data, **kwargs)
 
     @classmethod
-    def _get_custom_serializers(cls, data_type, **kwargs):
+    def _get_custom_serializers(cls, data_type, **kwargs):  # pylint: disable=inconsistent-return-statements
         custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type)
         if custom_serializer:
             return custom_serializer
@@ -841,23 +905,26 @@ def serialize_basic(cls, data, data_type, **kwargs):
         - basic_types_serializers dict[str, callable] : If set, use the callable as serializer
         - is_xml bool : If set, use xml_basic_types_serializers
 
-        :param data: Object to be serialized.
+        :param obj data: Object to be serialized.
         :param str data_type: Type of object in the iterable.
+        :rtype: str, int, float, bool
+        :return: serialized object
         """
         custom_serializer = cls._get_custom_serializers(data_type, **kwargs)
         if custom_serializer:
             return custom_serializer(data)
         if data_type == "str":
             return cls.serialize_unicode(data)
-        return eval(data_type)(data)  # nosec
+        return eval(data_type)(data)  # nosec # pylint: disable=eval-used
 
     @classmethod
     def serialize_unicode(cls, data):
         """Special handling for serializing unicode strings in Py2.
         Encode to UTF-8 if unicode, otherwise handle as a str.
 
-        :param data: Object to be serialized.
+        :param str data: Object to be serialized.
         :rtype: str
+        :return: serialized object
         """
         try:  # If I received an enum, return its value
             return data.value
@@ -871,8 +938,7 @@ def serialize_unicode(cls, data):
                 return data
         except NameError:
             return str(data)
-        else:
-            return str(data)
+        return str(data)
 
     def serialize_iter(self, data, iter_type, div=None, **kwargs):
         """Serialize iterable.
@@ -882,15 +948,13 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
           serialization_ctxt['type'] should be same as data_type.
         - is_xml bool : If set, serialize as XML
 
-        :param list attr: Object to be serialized.
+        :param list data: Object to be serialized.
         :param str iter_type: Type of object in the iterable.
-        :param bool required: Whether the objects in the iterable must
-         not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
-        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
         Defaults to False.
         :rtype: list, str
+        :return: serialized iterable
         """
         if isinstance(data, str):
             raise SerializationError("Refuse str type as a valid iter type.")
@@ -945,9 +1009,8 @@ def serialize_dict(self, attr, dict_type, **kwargs):
 
         :param dict attr: Object to be serialized.
         :param str dict_type: Type of object in the dictionary.
-        :param bool required: Whether the objects in the dictionary must
-         not be None or empty.
         :rtype: dict
+        :return: serialized dictionary
         """
         serialization_ctxt = kwargs.get("serialization_ctxt", {})
         serialized = {}
@@ -971,7 +1034,7 @@ def serialize_dict(self, attr, dict_type, **kwargs):
 
         return serialized
 
-    def serialize_object(self, attr, **kwargs):
+    def serialize_object(self, attr, **kwargs):  # pylint: disable=too-many-return-statements
         """Serialize a generic object.
         This will be handled as a dictionary. If object passed in is not
         a basic type (str, int, float, dict, list) it will simply be
@@ -979,6 +1042,7 @@ def serialize_object(self, attr, **kwargs):
 
         :param dict attr: Object to be serialized.
         :rtype: dict or str
+        :return: serialized object
         """
         if attr is None:
             return None
@@ -1003,7 +1067,7 @@ def serialize_object(self, attr, **kwargs):
             return self.serialize_decimal(attr)
 
         # If it's a model or I know this dependency, serialize as a Model
-        elif obj_type in self.dependencies.values() or isinstance(attr, Model):
+        if obj_type in self.dependencies.values() or isinstance(attr, Model):
             return self._serialize(attr)
 
         if obj_type == dict:
@@ -1034,56 +1098,61 @@ def serialize_enum(attr, enum_obj=None):
         try:
             enum_obj(result)  # type: ignore
             return result
-        except ValueError:
+        except ValueError as exc:
             for enum_value in enum_obj:  # type: ignore
                 if enum_value.value.lower() == str(attr).lower():
                     return enum_value.value
             error = "{!r} is not valid value for enum {!r}"
-            raise SerializationError(error.format(attr, enum_obj))
+            raise SerializationError(error.format(attr, enum_obj)) from exc
 
     @staticmethod
-    def serialize_bytearray(attr, **kwargs):
+    def serialize_bytearray(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize bytearray into base-64 string.
 
-        :param attr: Object to be serialized.
+        :param str attr: Object to be serialized.
         :rtype: str
+        :return: serialized base64
         """
         return b64encode(attr).decode()
 
     @staticmethod
-    def serialize_base64(attr, **kwargs):
+    def serialize_base64(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize str into base-64 string.
 
-        :param attr: Object to be serialized.
+        :param str attr: Object to be serialized.
         :rtype: str
+        :return: serialized base64
         """
         encoded = b64encode(attr).decode("ascii")
         return encoded.strip("=").replace("+", "-").replace("/", "_")
 
     @staticmethod
-    def serialize_decimal(attr, **kwargs):
+    def serialize_decimal(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Decimal object to float.
 
-        :param attr: Object to be serialized.
+        :param decimal attr: Object to be serialized.
         :rtype: float
+        :return: serialized decimal
         """
         return float(attr)
 
     @staticmethod
-    def serialize_long(attr, **kwargs):
+    def serialize_long(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize long (Py2) or int (Py3).
 
-        :param attr: Object to be serialized.
+        :param int attr: Object to be serialized.
         :rtype: int/long
+        :return: serialized long
         """
         return _long_type(attr)
 
     @staticmethod
-    def serialize_date(attr, **kwargs):
+    def serialize_date(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Date object into ISO-8601 formatted string.
 
         :param Date attr: Object to be serialized.
         :rtype: str
+        :return: serialized date
         """
         if isinstance(attr, str):
             attr = isodate.parse_date(attr)
@@ -1091,11 +1160,12 @@ def serialize_date(attr, **kwargs):
         return t
 
     @staticmethod
-    def serialize_time(attr, **kwargs):
+    def serialize_time(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Time object into ISO-8601 formatted string.
 
         :param datetime.time attr: Object to be serialized.
         :rtype: str
+        :return: serialized time
         """
         if isinstance(attr, str):
             attr = isodate.parse_time(attr)
@@ -1105,30 +1175,32 @@ def serialize_time(attr, **kwargs):
         return t
 
     @staticmethod
-    def serialize_duration(attr, **kwargs):
+    def serialize_duration(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize TimeDelta object into ISO-8601 formatted string.
 
         :param TimeDelta attr: Object to be serialized.
         :rtype: str
+        :return: serialized duration
         """
         if isinstance(attr, str):
             attr = isodate.parse_duration(attr)
         return isodate.duration_isoformat(attr)
 
     @staticmethod
-    def serialize_rfc(attr, **kwargs):
+    def serialize_rfc(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Datetime object into RFC-1123 formatted string.
 
         :param Datetime attr: Object to be serialized.
         :rtype: str
         :raises: TypeError if format invalid.
+        :return: serialized rfc
         """
         try:
             if not attr.tzinfo:
                 _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
             utc = attr.utctimetuple()
-        except AttributeError:
-            raise TypeError("RFC1123 object must be valid Datetime object.")
+        except AttributeError as exc:
+            raise TypeError("RFC1123 object must be valid Datetime object.") from exc
 
         return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format(
             Serializer.days[utc.tm_wday],
@@ -1141,12 +1213,13 @@ def serialize_rfc(attr, **kwargs):
         )
 
     @staticmethod
-    def serialize_iso(attr, **kwargs):
+    def serialize_iso(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Datetime object into ISO-8601 formatted string.
 
         :param Datetime attr: Object to be serialized.
         :rtype: str
         :raises: SerializationError if format invalid.
+        :return: serialized iso
         """
         if isinstance(attr, str):
             attr = isodate.parse_datetime(attr)
@@ -1172,13 +1245,14 @@ def serialize_iso(attr, **kwargs):
             raise TypeError(msg) from err
 
     @staticmethod
-    def serialize_unix(attr, **kwargs):
+    def serialize_unix(attr, **kwargs):  # pylint: disable=unused-argument
         """Serialize Datetime object into IntTime format.
         This is represented as seconds.
 
         :param Datetime attr: Object to be serialized.
         :rtype: int
         :raises: SerializationError if format invalid
+        :return: serialied unix
         """
         if isinstance(attr, int):
             return attr
@@ -1186,11 +1260,11 @@ def serialize_unix(attr, **kwargs):
             if not attr.tzinfo:
                 _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
             return int(calendar.timegm(attr.utctimetuple()))
-        except AttributeError:
-            raise TypeError("Unix time object must be valid Datetime object.")
+        except AttributeError as exc:
+            raise TypeError("Unix time object must be valid Datetime object.") from exc
 
 
-def rest_key_extractor(attr, attr_desc, data):
+def rest_key_extractor(attr, attr_desc, data):  # pylint: disable=unused-argument
     key = attr_desc["key"]
     working_data = data
 
@@ -1211,7 +1285,9 @@ def rest_key_extractor(attr, attr_desc, data):
     return working_data.get(key)
 
 
-def rest_key_case_insensitive_extractor(attr, attr_desc, data):
+def rest_key_case_insensitive_extractor(  # pylint: disable=unused-argument, inconsistent-return-statements
+    attr, attr_desc, data
+):
     key = attr_desc["key"]
     working_data = data
 
@@ -1232,17 +1308,29 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data):
         return attribute_key_case_insensitive_extractor(key, None, working_data)
 
 
-def last_rest_key_extractor(attr, attr_desc, data):
-    """Extract the attribute in "data" based on the last part of the JSON path key."""
+def last_rest_key_extractor(attr, attr_desc, data):  # pylint: disable=unused-argument
+    """Extract the attribute in "data" based on the last part of the JSON path key.
+
+    :param str attr: The attribute to extract
+    :param dict attr_desc: The attribute description
+    :param dict data: The data to extract from
+    :rtype: object
+    :returns: The extracted attribute
+    """
     key = attr_desc["key"]
     dict_keys = _FLATTEN.split(key)
     return attribute_key_extractor(dict_keys[-1], None, data)
 
 
-def last_rest_key_case_insensitive_extractor(attr, attr_desc, data):
+def last_rest_key_case_insensitive_extractor(attr, attr_desc, data):  # pylint: disable=unused-argument
     """Extract the attribute in "data" based on the last part of the JSON path key.
 
     This is the case insensitive version of "last_rest_key_extractor"
+    :param str attr: The attribute to extract
+    :param dict attr_desc: The attribute description
+    :param dict data: The data to extract from
+    :rtype: object
+    :returns: The extracted attribute
     """
     key = attr_desc["key"]
     dict_keys = _FLATTEN.split(key)
@@ -1279,7 +1367,7 @@ def _extract_name_from_internal_type(internal_type):
     return xml_name
 
 
-def xml_key_extractor(attr, attr_desc, data):
+def xml_key_extractor(attr, attr_desc, data):  # pylint: disable=unused-argument,too-many-return-statements
     if isinstance(data, dict):
         return None
 
@@ -1331,22 +1419,21 @@ def xml_key_extractor(attr, attr_desc, data):
         if is_iter_type:
             if is_wrapped:
                 return None  # is_wrapped no node, we want None
-            else:
-                return []  # not wrapped, assume empty list
+            return []  # not wrapped, assume empty list
         return None  # Assume it's not there, maybe an optional node.
 
     # If is_iter_type and not wrapped, return all found children
     if is_iter_type:
         if not is_wrapped:
             return children
-        else:  # Iter and wrapped, should have found one node only (the wrap one)
-            if len(children) != 1:
-                raise DeserializationError(
-                    "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(
-                        xml_name
-                    )
+        # Iter and wrapped, should have found one node only (the wrap one)
+        if len(children) != 1:
+            raise DeserializationError(
+                "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(  # pylint: disable=line-too-long
+                    xml_name
                 )
-            return list(children[0])  # Might be empty list and that's ok.
+            )
+        return list(children[0])  # Might be empty list and that's ok.
 
     # Here it's not a itertype, we should have found one element only or empty
     if len(children) > 1:
@@ -1354,7 +1441,7 @@ def xml_key_extractor(attr, attr_desc, data):
     return children[0]
 
 
-class Deserializer(object):
+class Deserializer:
     """Response object model deserializer.
 
     :param dict classes: Class type dictionary for deserializing complex types.
@@ -1363,9 +1450,9 @@ class Deserializer(object):
 
     basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
 
-    valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
+    valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
 
-    def __init__(self, classes: Optional[Mapping[str, type]] = None):
+    def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
         self.deserialize_type = {
             "iso-8601": Deserializer.deserialize_iso,
             "rfc-1123": Deserializer.deserialize_rfc,
@@ -1403,11 +1490,12 @@ def __call__(self, target_obj, response_data, content_type=None):
         :param str content_type: Swagger "produces" if available.
         :raises: DeserializationError if deserialization fails.
         :return: Deserialized object.
+        :rtype: object
         """
         data = self._unpack_content(response_data, content_type)
         return self._deserialize(target_obj, data)
 
-    def _deserialize(self, target_obj, data):
+    def _deserialize(self, target_obj, data):  # pylint: disable=inconsistent-return-statements
         """Call the deserializer on a model.
 
         Data needs to be already deserialized as JSON or XML ElementTree
@@ -1416,12 +1504,13 @@ def _deserialize(self, target_obj, data):
         :param object data: Object to deserialize.
         :raises: DeserializationError if deserialization fails.
         :return: Deserialized object.
+        :rtype: object
         """
         # This is already a model, go recursive just in case
         if hasattr(data, "_attribute_map"):
             constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")]
             try:
-                for attr, mapconfig in data._attribute_map.items():
+                for attr, mapconfig in data._attribute_map.items():  # pylint: disable=protected-access
                     if attr in constants:
                         continue
                     value = getattr(data, attr)
@@ -1440,13 +1529,13 @@ def _deserialize(self, target_obj, data):
 
         if isinstance(response, str):
             return self.deserialize_data(data, response)
-        elif isinstance(response, type) and issubclass(response, Enum):
+        if isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
         if data is None or data is CoreNull:
             return data
         try:
-            attributes = response._attribute_map  # type: ignore
+            attributes = response._attribute_map  # type: ignore # pylint: disable=protected-access
             d_attrs = {}
             for attr, attr_desc in attributes.items():
                 # Check empty string. If it's not empty, someone has a real "additionalProperties"...
@@ -1476,9 +1565,8 @@ def _deserialize(self, target_obj, data):
         except (AttributeError, TypeError, KeyError) as err:
             msg = "Unable to deserialize to object: " + class_name  # type: ignore
             raise DeserializationError(msg) from err
-        else:
-            additional_properties = self._build_additional_properties(attributes, data)
-            return self._instantiate_model(response, d_attrs, additional_properties)
+        additional_properties = self._build_additional_properties(attributes, data)
+        return self._instantiate_model(response, d_attrs, additional_properties)
 
     def _build_additional_properties(self, attribute_map, data):
         if not self.additional_properties_detection:
@@ -1505,6 +1593,8 @@ def _classify_target(self, target, data):
 
         :param str target: The target object type to deserialize to.
         :param str/dict data: The response data to deserialize.
+        :return: The classified target object and its class name.
+        :rtype: tuple
         """
         if target is None:
             return None, None
@@ -1516,7 +1606,7 @@ def _classify_target(self, target, data):
                 return target, target
 
         try:
-            target = target._classify(data, self.dependencies)  # type: ignore
+            target = target._classify(data, self.dependencies)  # type: ignore # pylint: disable=protected-access
         except AttributeError:
             pass  # Target is not a Model, no classify
         return target, target.__class__.__name__  # type: ignore
@@ -1531,10 +1621,12 @@ def failsafe_deserialize(self, target_obj, data, content_type=None):
         :param str target_obj: The target object type to deserialize to.
         :param str/dict data: The response data to deserialize.
         :param str content_type: Swagger "produces" if available.
+        :return: Deserialized object.
+        :rtype: object
         """
         try:
             return self(target_obj, data, content_type=content_type)
-        except:
+        except:  # pylint: disable=bare-except
             _LOGGER.debug(
                 "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
             )
@@ -1552,10 +1644,12 @@ def _unpack_content(raw_data, content_type=None):
 
         If raw_data is something else, bypass all logic and return it directly.
 
-        :param raw_data: Data to be processed.
-        :param content_type: How to parse if raw_data is a string/bytes.
+        :param obj raw_data: Data to be processed.
+        :param str content_type: How to parse if raw_data is a string/bytes.
         :raises JSONDecodeError: If JSON is requested and parsing is impossible.
         :raises UnicodeDecodeError: If bytes is not UTF8
+        :rtype: object
+        :return: Unpacked content.
         """
         # Assume this is enough to detect a Pipeline Response without importing it
         context = getattr(raw_data, "context", {})
@@ -1579,24 +1673,35 @@ def _unpack_content(raw_data, content_type=None):
     def _instantiate_model(self, response, attrs, additional_properties=None):
         """Instantiate a response model passing in deserialized args.
 
-        :param response: The response model class.
-        :param d_attrs: The deserialized response attributes.
+        :param Response response: The response model class.
+        :param dict attrs: The deserialized response attributes.
+        :param dict additional_properties: Additional properties to be set.
+        :rtype: Response
+        :return: The instantiated response model.
         """
         if callable(response):
             subtype = getattr(response, "_subtype_map", {})
             try:
-                readonly = [k for k, v in response._validation.items() if v.get("readonly")]
-                const = [k for k, v in response._validation.items() if v.get("constant")]
+                readonly = [
+                    k
+                    for k, v in response._validation.items()  # pylint: disable=protected-access  # type: ignore
+                    if v.get("readonly")
+                ]
+                const = [
+                    k
+                    for k, v in response._validation.items()  # pylint: disable=protected-access  # type: ignore
+                    if v.get("constant")
+                ]
                 kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const}
                 response_obj = response(**kwargs)
                 for attr in readonly:
                     setattr(response_obj, attr, attrs.get(attr))
                 if additional_properties:
-                    response_obj.additional_properties = additional_properties
+                    response_obj.additional_properties = additional_properties  # type: ignore
                 return response_obj
             except TypeError as err:
                 msg = "Unable to deserialize {} into model {}. ".format(kwargs, response)  # type: ignore
-                raise DeserializationError(msg + str(err))
+                raise DeserializationError(msg + str(err)) from err
         else:
             try:
                 for attr, value in attrs.items():
@@ -1605,15 +1710,16 @@ def _instantiate_model(self, response, attrs, additional_properties=None):
             except Exception as exp:
                 msg = "Unable to populate response model. "
                 msg += "Type: {}, Error: {}".format(type(response), exp)
-                raise DeserializationError(msg)
+                raise DeserializationError(msg) from exp
 
-    def deserialize_data(self, data, data_type):
+    def deserialize_data(self, data, data_type):  # pylint: disable=too-many-return-statements
         """Process data for deserialization according to data type.
 
         :param str data: The response string to be deserialized.
         :param str data_type: The type to deserialize to.
         :raises: DeserializationError if deserialization fails.
         :return: Deserialized object.
+        :rtype: object
         """
         if data is None:
             return data
@@ -1627,7 +1733,11 @@ def deserialize_data(self, data, data_type):
                 if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())):
                     return data
 
-                is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"]
+                is_a_text_parsing_type = lambda x: x not in [  # pylint: disable=unnecessary-lambda-assignment
+                    "object",
+                    "[]",
+                    r"{}",
+                ]
                 if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text:
                     return None
                 data_val = self.deserialize_type[data_type](data)
@@ -1647,14 +1757,14 @@ def deserialize_data(self, data, data_type):
             msg = "Unable to deserialize response data."
             msg += " Data: {}, {}".format(data, data_type)
             raise DeserializationError(msg) from err
-        else:
-            return self._deserialize(obj_type, data)
+        return self._deserialize(obj_type, data)
 
     def deserialize_iter(self, attr, iter_type):
         """Deserialize an iterable.
 
         :param list attr: Iterable to be deserialized.
         :param str iter_type: The type of object in the iterable.
+        :return: Deserialized iterable.
         :rtype: list
         """
         if attr is None:
@@ -1671,6 +1781,7 @@ def deserialize_dict(self, attr, dict_type):
         :param dict/list attr: Dictionary to be deserialized. Also accepts
          a list of key, value pairs.
         :param str dict_type: The object type of the items in the dictionary.
+        :return: Deserialized dictionary.
         :rtype: dict
         """
         if isinstance(attr, list):
@@ -1681,11 +1792,12 @@ def deserialize_dict(self, attr, dict_type):
             attr = {el.tag: el.text for el in attr}
         return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()}
 
-    def deserialize_object(self, attr, **kwargs):
+    def deserialize_object(self, attr, **kwargs):  # pylint: disable=too-many-return-statements
         """Deserialize a generic object.
         This will be handled as a dictionary.
 
         :param dict attr: Dictionary to be deserialized.
+        :return: Deserialized object.
         :rtype: dict
         :raises: TypeError if non-builtin datatype encountered.
         """
@@ -1720,11 +1832,10 @@ def deserialize_object(self, attr, **kwargs):
                     pass
             return deserialized
 
-        else:
-            error = "Cannot deserialize generic object with type: "
-            raise TypeError(error + str(obj_type))
+        error = "Cannot deserialize generic object with type: "
+        raise TypeError(error + str(obj_type))
 
-    def deserialize_basic(self, attr, data_type):
+    def deserialize_basic(self, attr, data_type):  # pylint: disable=too-many-return-statements
         """Deserialize basic builtin data type from string.
         Will attempt to convert to str, int, float and bool.
         This function will also accept '1', '0', 'true' and 'false' as
@@ -1732,6 +1843,7 @@ def deserialize_basic(self, attr, data_type):
 
         :param str attr: response string to be deserialized.
         :param str data_type: deserialization data type.
+        :return: Deserialized basic type.
         :rtype: str, int, float or bool
         :raises: TypeError if string format is not valid.
         """
@@ -1743,24 +1855,23 @@ def deserialize_basic(self, attr, data_type):
                 if data_type == "str":
                     # None or '', node <a/> is empty string.
                     return ""
-                else:
-                    # None or '', node <a/> with a strong type is None.
-                    # Don't try to model "empty bool" or "empty int"
-                    return None
+                # None or '', node <a/> with a strong type is None.
+                # Don't try to model "empty bool" or "empty int"
+                return None
 
         if data_type == "bool":
             if attr in [True, False, 1, 0]:
                 return bool(attr)
-            elif isinstance(attr, str):
+            if isinstance(attr, str):
                 if attr.lower() in ["true", "1"]:
                     return True
-                elif attr.lower() in ["false", "0"]:
+                if attr.lower() in ["false", "0"]:
                     return False
             raise TypeError("Invalid boolean value: {}".format(attr))
 
         if data_type == "str":
             return self.deserialize_unicode(attr)
-        return eval(data_type)(attr)  # nosec
+        return eval(data_type)(attr)  # nosec # pylint: disable=eval-used
 
     @staticmethod
     def deserialize_unicode(data):
@@ -1768,6 +1879,7 @@ def deserialize_unicode(data):
         as a string.
 
         :param str data: response string to be deserialized.
+        :return: Deserialized string.
         :rtype: str or unicode
         """
         # We might be here because we have an enum modeled as string,
@@ -1781,8 +1893,7 @@ def deserialize_unicode(data):
                 return data
         except NameError:
             return str(data)
-        else:
-            return str(data)
+        return str(data)
 
     @staticmethod
     def deserialize_enum(data, enum_obj):
@@ -1794,6 +1905,7 @@ def deserialize_enum(data, enum_obj):
         :param str data: Response string to be deserialized. If this value is
          None or invalid it will be returned as-is.
         :param Enum enum_obj: Enum object to deserialize to.
+        :return: Deserialized enum object.
         :rtype: Enum
         """
         if isinstance(data, enum_obj) or data is None:
@@ -1804,9 +1916,9 @@ def deserialize_enum(data, enum_obj):
             # Workaround. We might consider remove it in the future.
             try:
                 return list(enum_obj.__members__.values())[data]
-            except IndexError:
+            except IndexError as exc:
                 error = "{!r} is not a valid index for enum {!r}"
-                raise DeserializationError(error.format(data, enum_obj))
+                raise DeserializationError(error.format(data, enum_obj)) from exc
         try:
             return enum_obj(str(data))
         except ValueError:
@@ -1822,6 +1934,7 @@ def deserialize_bytearray(attr):
         """Deserialize string into bytearray.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized bytearray
         :rtype: bytearray
         :raises: TypeError if string format invalid.
         """
@@ -1834,6 +1947,7 @@ def deserialize_base64(attr):
         """Deserialize base64 encoded string into string.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized base64 string
         :rtype: bytearray
         :raises: TypeError if string format invalid.
         """
@@ -1849,8 +1963,9 @@ def deserialize_decimal(attr):
         """Deserialize string into Decimal object.
 
         :param str attr: response string to be deserialized.
-        :rtype: Decimal
+        :return: Deserialized decimal
         :raises: DeserializationError if string format invalid.
+        :rtype: decimal
         """
         if isinstance(attr, ET.Element):
             attr = attr.text
@@ -1865,6 +1980,7 @@ def deserialize_long(attr):
         """Deserialize string into long (Py2) or int (Py3).
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized int
         :rtype: long or int
         :raises: ValueError if string format invalid.
         """
@@ -1877,6 +1993,7 @@ def deserialize_duration(attr):
         """Deserialize ISO-8601 formatted string into TimeDelta object.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized duration
         :rtype: TimeDelta
         :raises: DeserializationError if string format invalid.
         """
@@ -1887,14 +2004,14 @@ def deserialize_duration(attr):
         except (ValueError, OverflowError, AttributeError) as err:
             msg = "Cannot deserialize duration object."
             raise DeserializationError(msg) from err
-        else:
-            return duration
+        return duration
 
     @staticmethod
     def deserialize_date(attr):
         """Deserialize ISO-8601 formatted string into Date object.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized date
         :rtype: Date
         :raises: DeserializationError if string format invalid.
         """
@@ -1910,6 +2027,7 @@ def deserialize_time(attr):
         """Deserialize ISO-8601 formatted string into time object.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized time
         :rtype: datetime.time
         :raises: DeserializationError if string format invalid.
         """
@@ -1924,6 +2042,7 @@ def deserialize_rfc(attr):
         """Deserialize RFC-1123 formatted string into Datetime object.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized RFC datetime
         :rtype: Datetime
         :raises: DeserializationError if string format invalid.
         """
@@ -1939,14 +2058,14 @@ def deserialize_rfc(attr):
         except ValueError as err:
             msg = "Cannot deserialize to rfc datetime object."
             raise DeserializationError(msg) from err
-        else:
-            return date_obj
+        return date_obj
 
     @staticmethod
     def deserialize_iso(attr):
         """Deserialize ISO-8601 formatted string into Datetime object.
 
         :param str attr: response string to be deserialized.
+        :return: Deserialized ISO datetime
         :rtype: Datetime
         :raises: DeserializationError if string format invalid.
         """
@@ -1976,8 +2095,7 @@ def deserialize_iso(attr):
         except (ValueError, OverflowError, AttributeError) as err:
             msg = "Cannot deserialize datetime object."
             raise DeserializationError(msg) from err
-        else:
-            return date_obj
+        return date_obj
 
     @staticmethod
     def deserialize_unix(attr):
@@ -1985,6 +2103,7 @@ def deserialize_unix(attr):
         This is represented as seconds.
 
         :param int attr: Object to be serialized.
+        :return: Deserialized datetime
         :rtype: Datetime
         :raises: DeserializationError if format invalid
         """
@@ -1996,5 +2115,4 @@ def deserialize_unix(attr):
         except ValueError as err:
             msg = "Cannot deserialize to unix datetime object."
             raise DeserializationError(msg) from err
-        else:
-            return date_obj
+        return date_obj
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_version.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_version.py
index a741dc7b69b..e5754a47ce6 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_version.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.1.0b4"
+VERSION = "1.0.0b1"
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/__init__.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/__init__.py
index f09378ce2ff..15c4c4b8dbe 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/__init__.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/__init__.py
@@ -5,12 +5,18 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._microsoft_elastic import MicrosoftElastic
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._microsoft_elastic import MicrosoftElastic  # type: ignore
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
@@ -18,6 +24,6 @@
 __all__ = [
     "MicrosoftElastic",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_configuration.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_configuration.py
index 91988f778fc..d0cbc41f6a7 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_configuration.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_configuration.py
@@ -14,11 +14,10 @@
 from .._version import VERSION
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for MicrosoftElastic.
 
     Note that all parameters used to create this instance are saved as instance
@@ -28,13 +27,13 @@ class MicrosoftElasticConfiguration:  # pylint: disable=too-many-instance-attrib
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2024-06-15-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2025-01-15-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
-        api_version: str = kwargs.pop("api_version", "2024-06-15-preview")
+        api_version: str = kwargs.pop("api_version", "2025-01-15-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_microsoft_elastic.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_microsoft_elastic.py
index eb1747f32c2..94c04c98994 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_microsoft_elastic.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/_microsoft_elastic.py
@@ -47,11 +47,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class MicrosoftElastic:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class MicrosoftElastic:  # pylint: disable=too-many-instance-attributes
     """MicrosoftElastic.
 
     :ivar operations: Operations operations
@@ -117,7 +116,7 @@ class MicrosoftElastic:  # pylint: disable=client-accepts-api-version-keyword,to
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2024-06-15-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2025-01-15-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/__init__.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/__init__.py
index 1cdfeb9a7b4..d920cd5fb72 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/__init__.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/__init__.py
@@ -5,35 +5,41 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._monitors_operations import MonitorsOperations
-from ._elastic_versions_operations import ElasticVersionsOperations
-from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations
-from ._monitored_resources_operations import MonitoredResourcesOperations
-from ._deployment_info_operations import DeploymentInfoOperations
-from ._external_user_operations import ExternalUserOperations
-from ._billing_info_operations import BillingInfoOperations
-from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations
-from ._open_ai_operations import OpenAIOperations
-from ._tag_rules_operations import TagRulesOperations
-from ._vm_host_operations import VMHostOperations
-from ._vm_ingestion_operations import VMIngestionOperations
-from ._vm_collection_operations import VMCollectionOperations
-from ._upgradable_versions_operations import UpgradableVersionsOperations
-from ._monitor_operations import MonitorOperations
-from ._all_traffic_filters_operations import AllTrafficFiltersOperations
-from ._list_associated_traffic_filters_operations import ListAssociatedTrafficFiltersOperations
-from ._create_and_associate_ip_filter_operations import CreateAndAssociateIPFilterOperations
-from ._create_and_associate_pl_filter_operations import CreateAndAssociatePLFilterOperations
-from ._associate_traffic_filter_operations import AssociateTrafficFilterOperations
-from ._detach_and_delete_traffic_filter_operations import DetachAndDeleteTrafficFilterOperations
-from ._detach_traffic_filter_operations import DetachTrafficFilterOperations
-from ._traffic_filters_operations import TrafficFiltersOperations
-from ._organizations_operations import OrganizationsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._monitors_operations import MonitorsOperations  # type: ignore
+from ._elastic_versions_operations import ElasticVersionsOperations  # type: ignore
+from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations  # type: ignore
+from ._monitored_resources_operations import MonitoredResourcesOperations  # type: ignore
+from ._deployment_info_operations import DeploymentInfoOperations  # type: ignore
+from ._external_user_operations import ExternalUserOperations  # type: ignore
+from ._billing_info_operations import BillingInfoOperations  # type: ignore
+from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations  # type: ignore
+from ._open_ai_operations import OpenAIOperations  # type: ignore
+from ._tag_rules_operations import TagRulesOperations  # type: ignore
+from ._vm_host_operations import VMHostOperations  # type: ignore
+from ._vm_ingestion_operations import VMIngestionOperations  # type: ignore
+from ._vm_collection_operations import VMCollectionOperations  # type: ignore
+from ._upgradable_versions_operations import UpgradableVersionsOperations  # type: ignore
+from ._monitor_operations import MonitorOperations  # type: ignore
+from ._all_traffic_filters_operations import AllTrafficFiltersOperations  # type: ignore
+from ._list_associated_traffic_filters_operations import ListAssociatedTrafficFiltersOperations  # type: ignore
+from ._create_and_associate_ip_filter_operations import CreateAndAssociateIPFilterOperations  # type: ignore
+from ._create_and_associate_pl_filter_operations import CreateAndAssociatePLFilterOperations  # type: ignore
+from ._associate_traffic_filter_operations import AssociateTrafficFilterOperations  # type: ignore
+from ._detach_and_delete_traffic_filter_operations import DetachAndDeleteTrafficFilterOperations  # type: ignore
+from ._detach_traffic_filter_operations import DetachTrafficFilterOperations  # type: ignore
+from ._traffic_filters_operations import TrafficFiltersOperations  # type: ignore
+from ._organizations_operations import OrganizationsOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -63,5 +69,5 @@
     "TrafficFiltersOperations",
     "OrganizationsOperations",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 _patch_sdk()
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_all_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_all_traffic_filters_operations.py
index 861ff93eff4..57acd0d6821 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_all_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_all_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,7 +69,7 @@ async def list(
         :rtype: ~azure.mgmt.elastic.models.ElasticTrafficFilterResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_associate_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_associate_traffic_filter_operations.py
index 7f5521f5ebc..acbccaf7566 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_associate_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_associate_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, Optional, Type, TypeVar, Union, cast
+from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -60,7 +59,7 @@ def __init__(self, *args, **kwargs) -> None:
     async def _associate_initial(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_billing_info_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_billing_info_operations.py
index f3106e9bb12..35243f2f4ab 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_billing_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_billing_info_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -68,7 +67,7 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.elastic.models.BillingInfoResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_connected_partner_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_connected_partner_resources_operations.py
index b9053d30bbb..d925e816137 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_connected_partner_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_connected_partner_resources_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -82,7 +81,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ConnectedPartnerResourcesListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_ip_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_ip_filter_operations.py
index a0c6b8261e6..310006b7439 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_ip_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_ip_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, Optional, Type, TypeVar, Union, cast
+from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -65,7 +64,7 @@ async def _create_initial(
         name: Optional[str] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_pl_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_pl_filter_operations.py
index 0484a59d57f..2ea3c3aca23 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_pl_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_create_and_associate_pl_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, Optional, Type, TypeVar, Union, cast
+from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -66,7 +65,7 @@ async def _create_initial(
         private_endpoint_name: Optional[str] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_deployment_info_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_deployment_info_operations.py
index 67a8b2965a4..2f366d85f2b 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_deployment_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_deployment_info_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,7 +69,7 @@ async def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.elastic.models.DeploymentInfoResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_and_delete_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_and_delete_traffic_filter_operations.py
index 44f0c46daf6..5431eb9fc65 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_and_delete_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_and_delete_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -54,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> None:
         """Detach and Delete traffic filter from the given deployment.
@@ -72,7 +71,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_traffic_filter_operations.py
index 1d7ca8c993d..8f16bcf2c67 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_detach_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, Optional, Type, TypeVar, Union, cast
+from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -60,7 +59,7 @@ def __init__(self, *args, **kwargs) -> None:
     async def _update_initial(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_elastic_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_elastic_versions_operations.py
index c55d5473f9e..9f255e0c56c 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_elastic_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_elastic_versions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -75,7 +74,7 @@ def list(self, region: str, **kwargs: Any) -> AsyncIterable["_models.ElasticVers
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticVersionsListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_external_user_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_external_user_operations.py
index bbe670027f5..f6cc56cffef 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_external_user_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_external_user_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -30,7 +29,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -142,7 +141,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.ExternalUserCreationResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_list_associated_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_list_associated_traffic_filters_operations.py
index dc896a6f4a9..72bce94c0e7 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_list_associated_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_list_associated_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,7 +69,7 @@ async def list(
         :rtype: ~azure.mgmt.elastic.models.ElasticTrafficFilterResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitor_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitor_operations.py
index ddd1e5cd038..f3ad4e77735 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitor_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitor_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -34,7 +33,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -65,7 +64,7 @@ async def _upgrade_initial(
         body: Optional[Union[_models.ElasticMonitorUpgrade, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_resources_operations.py
index 376efeccb0b..f2309911684 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_resources_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -78,7 +77,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoredResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_subscriptions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_subscriptions_operations.py
index 17954a231f9..9e77523ecd2 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_subscriptions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitored_subscriptions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -43,7 +42,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -92,7 +91,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoredSubscriptionPropertiesList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -174,7 +173,7 @@ async def get(
         :rtype: ~azure.mgmt.elastic.models.MonitoredSubscriptionProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -226,7 +225,7 @@ async def _createor_update_initial(
         body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -443,7 +442,7 @@ async def _update_initial(
         body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -659,7 +658,7 @@ def get_long_running_output(pipeline_response):
     async def _delete_initial(
         self, resource_group_name: str, monitor_name: str, configuration_name: str, **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitors_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitors_operations.py
index ed1b3a8d47f..235be3ea09a 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitors_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_monitors_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -44,7 +43,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -86,7 +85,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.ElasticMonitorResource"]
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticMonitorResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -172,7 +171,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticMonitorResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -251,7 +250,7 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.elastic.models.ElasticMonitorResource
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -303,7 +302,7 @@ async def _create_initial(
         body: Optional[Union[_models.ElasticMonitorResource, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -510,7 +509,7 @@ async def _update_initial(
         body: Optional[Union[_models.ElasticMonitorResourceUpdateParameters, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -712,7 +711,7 @@ def get_long_running_output(pipeline_response):
         )
 
     async def _delete_initial(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_open_ai_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_open_ai_operations.py
index 5537bc72525..6d23b789c93 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_open_ai_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_open_ai_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -39,7 +38,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -88,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.OpenAIIntegrationRPModelListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -172,7 +171,7 @@ async def get(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationRPModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -309,7 +308,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationRPModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -371,9 +370,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, monitor_name: str, integration_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, monitor_name: str, integration_name: str, **kwargs: Any) -> None:
         """Delete OpenAI integration rule for a given monitor resource.
 
         Delete OpenAI integration rule for a given monitor resource.
@@ -389,7 +386,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -450,7 +447,7 @@ async def get_status(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationStatusResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_operations.py
index 4ef4c0f0d0c..590cc734f29 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -71,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]:
         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: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_organizations_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_organizations_operations.py
index fbfa8eafb70..970861372df 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_organizations_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_organizations_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -38,7 +37,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -121,7 +120,7 @@ async def get_api_key(
         :rtype: ~azure.mgmt.elastic.models.UserApiKeyResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -191,7 +190,7 @@ async def get_elastic_to_azure_subscription_mapping(  # pylint: disable=name-too
         :rtype: ~azure.mgmt.elastic.models.ElasticOrganizationToAzureSubscriptionMappingResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +242,7 @@ async def _resubscribe_initial(
         body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_tag_rules_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_tag_rules_operations.py
index 5997a419ea8..c67252aebd8 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_tag_rules_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_tag_rules_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -42,7 +41,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -89,7 +88,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoringTagRulesListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -245,7 +244,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.MonitoringTagRules
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +324,7 @@ async def get(
         :rtype: ~azure.mgmt.elastic.models.MonitoringTagRules
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -374,7 +373,7 @@ async def get(
     async def _delete_initial(
         self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any
     ) -> AsyncIterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_traffic_filters_operations.py
index 5ed5c2ee55b..e29e4c3387f 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -54,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> None:
         """Delete traffic filter from the account.
@@ -72,7 +71,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_upgradable_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_upgradable_versions_operations.py
index 61fc5593e89..32881f4c913 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_upgradable_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_upgradable_versions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,7 +69,7 @@ async def details(
         :rtype: ~azure.mgmt.elastic.models.UpgradableVersionsList
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_collection_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_collection_operations.py
index 8b0ccf3c67d..c9f397e5e11 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_collection_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_collection_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -30,7 +29,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -55,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @overload
-    async def update(  # pylint: disable=inconsistent-return-statements
+    async def update(
         self,
         resource_group_name: str,
         monitor_name: str,
@@ -84,7 +83,7 @@ async def update(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def update(  # pylint: disable=inconsistent-return-statements
+    async def update(
         self,
         resource_group_name: str,
         monitor_name: str,
@@ -113,7 +112,7 @@ async def update(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def update(  # pylint: disable=inconsistent-return-statements
+    async def update(
         self,
         resource_group_name: str,
         monitor_name: str,
@@ -136,7 +135,7 @@ async def update(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_host_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_host_operations.py
index 05240605c32..cf8e1ca9bb7 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_host_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_host_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -76,7 +75,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.VMHostListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_ingestion_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_ingestion_operations.py
index d0a726a92fb..8acd30d3425 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_ingestion_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/aio/operations/_vm_ingestion_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -70,7 +69,7 @@ async def details(
         :rtype: ~azure.mgmt.elastic.models.VMIngestionDetailsResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/__init__.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/__init__.py
index e7cb4bb3396..fe7f8f216b9 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/__init__.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/__init__.py
@@ -5,87 +5,102 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._models_py3 import BillingInfoResponse
-from ._models_py3 import CompanyInfo
-from ._models_py3 import ConnectedPartnerResourceProperties
-from ._models_py3 import ConnectedPartnerResourcesListFormat
-from ._models_py3 import ConnectedPartnerResourcesListResponse
-from ._models_py3 import DeploymentInfoResponse
-from ._models_py3 import ElasticCloudDeployment
-from ._models_py3 import ElasticCloudUser
-from ._models_py3 import ElasticMonitorResource
-from ._models_py3 import ElasticMonitorResourceListResponse
-from ._models_py3 import ElasticMonitorResourceUpdateParameters
-from ._models_py3 import ElasticMonitorUpgrade
-from ._models_py3 import ElasticOrganizationToAzureSubscriptionMappingResponse
-from ._models_py3 import ElasticOrganizationToAzureSubscriptionMappingResponseProperties
-from ._models_py3 import ElasticProperties
-from ._models_py3 import ElasticTrafficFilter
-from ._models_py3 import ElasticTrafficFilterResponse
-from ._models_py3 import ElasticTrafficFilterRule
-from ._models_py3 import ElasticVersionListFormat
-from ._models_py3 import ElasticVersionListProperties
-from ._models_py3 import ElasticVersionsListResponse
-from ._models_py3 import ErrorAdditionalInfo
-from ._models_py3 import ErrorDetail
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExternalUserCreationResponse
-from ._models_py3 import ExternalUserInfo
-from ._models_py3 import FilteringTag
-from ._models_py3 import IdentityProperties
-from ._models_py3 import LogRules
-from ._models_py3 import MarketplaceSaaSInfo
-from ._models_py3 import MarketplaceSaaSInfoMarketplaceSubscription
-from ._models_py3 import MonitorProperties
-from ._models_py3 import MonitoredResource
-from ._models_py3 import MonitoredResourceListResponse
-from ._models_py3 import MonitoredSubscription
-from ._models_py3 import MonitoredSubscriptionProperties
-from ._models_py3 import MonitoredSubscriptionPropertiesList
-from ._models_py3 import MonitoringTagRules
-from ._models_py3 import MonitoringTagRulesListResponse
-from ._models_py3 import MonitoringTagRulesProperties
-from ._models_py3 import OpenAIIntegrationProperties
-from ._models_py3 import OpenAIIntegrationRPModel
-from ._models_py3 import OpenAIIntegrationRPModelListResponse
-from ._models_py3 import OpenAIIntegrationStatusResponse
-from ._models_py3 import OpenAIIntegrationStatusResponseProperties
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import OperationResult
-from ._models_py3 import PartnerBillingEntity
-from ._models_py3 import PlanDetails
-from ._models_py3 import ResourceProviderDefaultErrorResponse
-from ._models_py3 import ResourceSku
-from ._models_py3 import ResubscribeProperties
-from ._models_py3 import SubscriptionList
-from ._models_py3 import SystemData
-from ._models_py3 import UpgradableVersionsList
-from ._models_py3 import UserApiKeyResponse
-from ._models_py3 import UserApiKeyResponseProperties
-from ._models_py3 import UserEmailId
-from ._models_py3 import UserInfo
-from ._models_py3 import VMCollectionUpdate
-from ._models_py3 import VMHostListResponse
-from ._models_py3 import VMIngestionDetailsResponse
-from ._models_py3 import VMResources
+from typing import TYPE_CHECKING
 
-from ._microsoft_elastic_enums import CreatedByType
-from ._microsoft_elastic_enums import ElasticDeploymentStatus
-from ._microsoft_elastic_enums import LiftrResourceCategories
-from ._microsoft_elastic_enums import ManagedIdentityTypes
-from ._microsoft_elastic_enums import MonitoringStatus
-from ._microsoft_elastic_enums import Operation
-from ._microsoft_elastic_enums import OperationName
-from ._microsoft_elastic_enums import ProvisioningState
-from ._microsoft_elastic_enums import SendingLogs
-from ._microsoft_elastic_enums import Status
-from ._microsoft_elastic_enums import TagAction
-from ._microsoft_elastic_enums import Type
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    BillingInfoResponse,
+    CompanyInfo,
+    ConnectedPartnerResourceProperties,
+    ConnectedPartnerResourcesListFormat,
+    ConnectedPartnerResourcesListResponse,
+    DeploymentInfoResponse,
+    ElasticCloudDeployment,
+    ElasticCloudUser,
+    ElasticMonitorResource,
+    ElasticMonitorResourceListResponse,
+    ElasticMonitorResourceUpdateParameters,
+    ElasticMonitorUpgrade,
+    ElasticOrganizationToAzureSubscriptionMappingResponse,
+    ElasticOrganizationToAzureSubscriptionMappingResponseProperties,
+    ElasticProperties,
+    ElasticTrafficFilter,
+    ElasticTrafficFilterResponse,
+    ElasticTrafficFilterRule,
+    ElasticVersionListFormat,
+    ElasticVersionListProperties,
+    ElasticVersionsListResponse,
+    ErrorAdditionalInfo,
+    ErrorDetail,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExternalUserCreationResponse,
+    ExternalUserInfo,
+    FilteringTag,
+    IdentityProperties,
+    LogRules,
+    MarketplaceSaaSInfo,
+    MarketplaceSaaSInfoMarketplaceSubscription,
+    MonitorProperties,
+    MonitoredResource,
+    MonitoredResourceListResponse,
+    MonitoredSubscription,
+    MonitoredSubscriptionProperties,
+    MonitoredSubscriptionPropertiesList,
+    MonitoringTagRules,
+    MonitoringTagRulesListResponse,
+    MonitoringTagRulesProperties,
+    OpenAIIntegrationProperties,
+    OpenAIIntegrationRPModel,
+    OpenAIIntegrationRPModelListResponse,
+    OpenAIIntegrationStatusResponse,
+    OpenAIIntegrationStatusResponseProperties,
+    OperationDisplay,
+    OperationListResult,
+    OperationResult,
+    PartnerBillingEntity,
+    PlanDetails,
+    ProjectDetails,
+    ResourceProviderDefaultErrorResponse,
+    ResourceSku,
+    ResubscribeProperties,
+    SubscriptionList,
+    SystemData,
+    UpgradableVersionsList,
+    UserApiKeyResponse,
+    UserApiKeyResponseProperties,
+    UserEmailId,
+    UserInfo,
+    VMCollectionUpdate,
+    VMHostListResponse,
+    VMIngestionDetailsResponse,
+    VMResources,
+)
+
+from ._microsoft_elastic_enums import (  # type: ignore
+    ConfigurationType,
+    CreatedByType,
+    ElasticDeploymentStatus,
+    HostingType,
+    LiftrResourceCategories,
+    ManagedIdentityTypes,
+    MonitoringStatus,
+    Operation,
+    OperationName,
+    ProjectType,
+    ProvisioningState,
+    SendingLogs,
+    Status,
+    TagAction,
+    Type,
+)
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -140,6 +155,7 @@
     "OperationResult",
     "PartnerBillingEntity",
     "PlanDetails",
+    "ProjectDetails",
     "ResourceProviderDefaultErrorResponse",
     "ResourceSku",
     "ResubscribeProperties",
@@ -154,18 +170,21 @@
     "VMHostListResponse",
     "VMIngestionDetailsResponse",
     "VMResources",
+    "ConfigurationType",
     "CreatedByType",
     "ElasticDeploymentStatus",
+    "HostingType",
     "LiftrResourceCategories",
     "ManagedIdentityTypes",
     "MonitoringStatus",
     "Operation",
     "OperationName",
+    "ProjectType",
     "ProvisioningState",
     "SendingLogs",
     "Status",
     "TagAction",
     "Type",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 _patch_sdk()
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_microsoft_elastic_enums.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_microsoft_elastic_enums.py
index ddf60fa4b1b..a6fe9b98cff 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_microsoft_elastic_enums.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_microsoft_elastic_enums.py
@@ -10,6 +10,15 @@
 from azure.core import CaseInsensitiveEnumMeta
 
 
+class ConfigurationType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Configuration type of the Elasticsearch project."""
+
+    GENERAL_PURPOSE = "GeneralPurpose"
+    VECTOR = "Vector"
+    TIME_SERIES = "TimeSeries"
+    NOT_APPLICABLE = "NotApplicable"
+
+
 class CreatedByType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """The type of identity that created the resource."""
 
@@ -26,6 +35,13 @@ class ElasticDeploymentStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     UNHEALTHY = "Unhealthy"
 
 
+class HostingType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Hosting type of the monitor resource - either Hosted deployments or Serverless Projects."""
+
+    HOSTED = "Hosted"
+    SERVERLESS = "Serverless"
+
+
 class LiftrResourceCategories(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """LiftrResourceCategories."""
 
@@ -63,6 +79,15 @@ class OperationName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     DELETE = "Delete"
 
 
+class ProjectType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Project type; ex: Elasticsearch / Observability / Security."""
+
+    ELASTICSEARCH = "Elasticsearch"
+    OBSERVABILITY = "Observability"
+    SECURITY = "Security"
+    NOT_APPLICABLE = "NotApplicable"
+
+
 class ProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """Provisioning state of Elastic resource."""
 
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_models_py3.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_models_py3.py
index d47d3629939..d01bce1ad56 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_models_py3.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/models/_models_py3.py
@@ -1,5 +1,5 @@
-# coding=utf-8
 # pylint: disable=too-many-lines
+# coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
@@ -13,7 +13,6 @@
 from .. import _serialization
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from .. import models as _models
 
 
@@ -65,11 +64,11 @@ class CompanyInfo(_serialization.Model):
     """
 
     _validation = {
-        "domain": {"max_length": 250},
-        "business": {"max_length": 64},
+        "domain": {"max_length": 256},
+        "business": {"max_length": 128},
         "employees_number": {"max_length": 20},
-        "state": {"max_length": 64},
-        "country": {"max_length": 64},
+        "state": {"max_length": 128},
+        "country": {"max_length": 128},
     }
 
     _attribute_map = {
@@ -113,14 +112,16 @@ def __init__(
 class ConnectedPartnerResourceProperties(_serialization.Model):
     """Connected Partner Resource Properties.
 
-    :ivar partner_deployment_name: Elastic deployment name.
+    :ivar partner_deployment_name: Elastic resource name.
     :vartype partner_deployment_name: str
-    :ivar partner_deployment_uri: Deployment URL of the elasticsearch in Elastic cloud deployment.
+    :ivar partner_deployment_uri: URL of the resource in Elastic cloud.
     :vartype partner_deployment_uri: str
-    :ivar azure_resource_id: The azure resource Id of the deployment.
+    :ivar azure_resource_id: The azure resource Id of the resource.
     :vartype azure_resource_id: str
-    :ivar location: The location of the deployment.
+    :ivar location: The location of the resource.
     :vartype location: str
+    :ivar type: The hosting type of the resource.
+    :vartype type: str
     """
 
     _attribute_map = {
@@ -128,6 +129,7 @@ class ConnectedPartnerResourceProperties(_serialization.Model):
         "partner_deployment_uri": {"key": "partnerDeploymentUri", "type": "str"},
         "azure_resource_id": {"key": "azureResourceId", "type": "str"},
         "location": {"key": "location", "type": "str"},
+        "type": {"key": "type", "type": "str"},
     }
 
     def __init__(
@@ -137,24 +139,27 @@ def __init__(
         partner_deployment_uri: Optional[str] = None,
         azure_resource_id: Optional[str] = None,
         location: Optional[str] = None,
+        type: Optional[str] = None,
         **kwargs: Any
     ) -> None:
         """
-        :keyword partner_deployment_name: Elastic deployment name.
+        :keyword partner_deployment_name: Elastic resource name.
         :paramtype partner_deployment_name: str
-        :keyword partner_deployment_uri: Deployment URL of the elasticsearch in Elastic cloud
-         deployment.
+        :keyword partner_deployment_uri: URL of the resource in Elastic cloud.
         :paramtype partner_deployment_uri: str
-        :keyword azure_resource_id: The azure resource Id of the deployment.
+        :keyword azure_resource_id: The azure resource Id of the resource.
         :paramtype azure_resource_id: str
-        :keyword location: The location of the deployment.
+        :keyword location: The location of the resource.
         :paramtype location: str
+        :keyword type: The hosting type of the resource.
+        :paramtype type: str
         """
         super().__init__(**kwargs)
         self.partner_deployment_name = partner_deployment_name
         self.partner_deployment_uri = partner_deployment_uri
         self.azure_resource_id = azure_resource_id
         self.location = location
+        self.type = type
 
 
 class ConnectedPartnerResourcesListFormat(_serialization.Model):
@@ -231,6 +236,10 @@ class DeploymentInfoResponse(_serialization.Model):
     :vartype deployment_url: str
     :ivar marketplace_saas_info: Marketplace SaaS Info of the resource.
     :vartype marketplace_saas_info: ~azure.mgmt.elastic.models.MarketplaceSaaSInfo
+    :ivar project_type: Project Type - Applicable for Serverless only.
+    :vartype project_type: str
+    :ivar configuration_type: ConfigurationType Type - Applicable for Serverless only.
+    :vartype configuration_type: str
     """
 
     _validation = {
@@ -241,6 +250,8 @@ class DeploymentInfoResponse(_serialization.Model):
         "elasticsearch_end_point": {"readonly": True},
         "deployment_url": {"readonly": True},
         "marketplace_saas_info": {"readonly": True},
+        "project_type": {"readonly": True},
+        "configuration_type": {"readonly": True},
     }
 
     _attribute_map = {
@@ -251,6 +262,8 @@ class DeploymentInfoResponse(_serialization.Model):
         "elasticsearch_end_point": {"key": "elasticsearchEndPoint", "type": "str"},
         "deployment_url": {"key": "deploymentUrl", "type": "str"},
         "marketplace_saas_info": {"key": "marketplaceSaasInfo", "type": "MarketplaceSaaSInfo"},
+        "project_type": {"key": "projectType", "type": "str"},
+        "configuration_type": {"key": "configurationType", "type": "str"},
     }
 
     def __init__(self, **kwargs: Any) -> None:
@@ -263,6 +276,8 @@ def __init__(self, **kwargs: Any) -> None:
         self.elasticsearch_end_point = None
         self.deployment_url = None
         self.marketplace_saas_info = None
+        self.project_type = None
+        self.configuration_type = None
 
 
 class ElasticCloudDeployment(_serialization.Model):
@@ -365,6 +380,8 @@ class ElasticMonitorResource(_serialization.Model):
     :vartype name: str
     :ivar type: The type of the monitor resource.
     :vartype type: str
+    :ivar kind: The kind of the Elastic resource - observability, security, search etc.
+    :vartype kind: str
     :ivar sku: SKU of the monitor resource.
     :vartype sku: ~azure.mgmt.elastic.models.ResourceSku
     :ivar properties: Properties of the monitor resource.
@@ -391,6 +408,7 @@ class ElasticMonitorResource(_serialization.Model):
         "id": {"key": "id", "type": "str"},
         "name": {"key": "name", "type": "str"},
         "type": {"key": "type", "type": "str"},
+        "kind": {"key": "kind", "type": "str"},
         "sku": {"key": "sku", "type": "ResourceSku"},
         "properties": {"key": "properties", "type": "MonitorProperties"},
         "identity": {"key": "identity", "type": "IdentityProperties"},
@@ -403,6 +421,7 @@ def __init__(
         self,
         *,
         location: str,
+        kind: Optional[str] = None,
         sku: Optional["_models.ResourceSku"] = None,
         properties: Optional["_models.MonitorProperties"] = None,
         identity: Optional["_models.IdentityProperties"] = None,
@@ -410,6 +429,8 @@ def __init__(
         **kwargs: Any
     ) -> None:
         """
+        :keyword kind: The kind of the Elastic resource - observability, security, search etc.
+        :paramtype kind: str
         :keyword sku: SKU of the monitor resource.
         :paramtype sku: ~azure.mgmt.elastic.models.ResourceSku
         :keyword properties: Properties of the monitor resource.
@@ -425,6 +446,7 @@ def __init__(
         self.id = None
         self.name = None
         self.type = None
+        self.kind = kind
         self.sku = sku
         self.properties = properties
         self.identity = identity
@@ -1591,7 +1613,7 @@ def __init__(self, *, log_rules: Optional["_models.LogRules"] = None, **kwargs:
         self.log_rules = log_rules
 
 
-class MonitorProperties(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class MonitorProperties(_serialization.Model):
     """Properties specific to the monitor resource.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1626,6 +1648,12 @@ class MonitorProperties(_serialization.Model):  # pylint: disable=too-many-insta
     :vartype liftr_resource_preference: int
     :ivar generate_api_key: Flag to determine if User API Key has to be generated and shared.
     :vartype generate_api_key: bool
+    :ivar hosting_type: Hosting type of the monitor resource - either Hosted deployments OR
+     Serverless Projects. Known values are: "Hosted" and "Serverless".
+    :vartype hosting_type: str or ~azure.mgmt.elastic.models.HostingType
+    :ivar project_details: Project details of the monitor resource IF it belongs to Serverless
+     offer kind.
+    :vartype project_details: ~azure.mgmt.elastic.models.ProjectDetails
     """
 
     _validation = {
@@ -1648,6 +1676,8 @@ class MonitorProperties(_serialization.Model):  # pylint: disable=too-many-insta
         "liftr_resource_category": {"key": "liftrResourceCategory", "type": "str"},
         "liftr_resource_preference": {"key": "liftrResourcePreference", "type": "int"},
         "generate_api_key": {"key": "generateApiKey", "type": "bool"},
+        "hosting_type": {"key": "hostingType", "type": "str"},
+        "project_details": {"key": "projectDetails", "type": "ProjectDetails"},
     }
 
     def __init__(
@@ -1663,6 +1693,8 @@ def __init__(
         source_campaign_name: Optional[str] = None,
         source_campaign_id: Optional[str] = None,
         generate_api_key: Optional[bool] = None,
+        hosting_type: Optional[Union[str, "_models.HostingType"]] = None,
+        project_details: Optional["_models.ProjectDetails"] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -1688,6 +1720,12 @@ def __init__(
         :paramtype source_campaign_id: str
         :keyword generate_api_key: Flag to determine if User API Key has to be generated and shared.
         :paramtype generate_api_key: bool
+        :keyword hosting_type: Hosting type of the monitor resource - either Hosted deployments OR
+         Serverless Projects. Known values are: "Hosted" and "Serverless".
+        :paramtype hosting_type: str or ~azure.mgmt.elastic.models.HostingType
+        :keyword project_details: Project details of the monitor resource IF it belongs to Serverless
+         offer kind.
+        :paramtype project_details: ~azure.mgmt.elastic.models.ProjectDetails
         """
         super().__init__(**kwargs)
         self.provisioning_state = None
@@ -1703,6 +1741,8 @@ def __init__(
         self.liftr_resource_category = None
         self.liftr_resource_preference = None
         self.generate_api_key = generate_api_key
+        self.hosting_type = hosting_type
+        self.project_details = project_details
 
 
 class OpenAIIntegrationProperties(_serialization.Model):
@@ -2087,6 +2127,42 @@ def __init__(
         self.plan_name = plan_name
 
 
+class ProjectDetails(_serialization.Model):
+    """Project details of the monitor resource IF it belongs to Serverless offer kind.
+
+    :ivar project_type: Project type; ex: Elasticsearch / Observability / Security. Known values
+     are: "Elasticsearch", "Observability", "Security", and "NotApplicable".
+    :vartype project_type: str or ~azure.mgmt.elastic.models.ProjectType
+    :ivar configuration_type: Configuration type of the Elasticsearch project. Known values are:
+     "GeneralPurpose", "Vector", "TimeSeries", and "NotApplicable".
+    :vartype configuration_type: str or ~azure.mgmt.elastic.models.ConfigurationType
+    """
+
+    _attribute_map = {
+        "project_type": {"key": "projectType", "type": "str"},
+        "configuration_type": {"key": "configurationType", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        project_type: Optional[Union[str, "_models.ProjectType"]] = None,
+        configuration_type: Optional[Union[str, "_models.ConfigurationType"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword project_type: Project type; ex: Elasticsearch / Observability / Security. Known values
+         are: "Elasticsearch", "Observability", "Security", and "NotApplicable".
+        :paramtype project_type: str or ~azure.mgmt.elastic.models.ProjectType
+        :keyword configuration_type: Configuration type of the Elasticsearch project. Known values are:
+         "GeneralPurpose", "Vector", "TimeSeries", and "NotApplicable".
+        :paramtype configuration_type: str or ~azure.mgmt.elastic.models.ConfigurationType
+        """
+        super().__init__(**kwargs)
+        self.project_type = project_type
+        self.configuration_type = configuration_type
+
+
 class ResourceProviderDefaultErrorResponse(_serialization.Model):
     """RP default error response.
 
@@ -2414,9 +2490,9 @@ class UserInfo(_serialization.Model):
     """
 
     _validation = {
-        "first_name": {"max_length": 50},
-        "last_name": {"max_length": 50},
-        "company_name": {"max_length": 64},
+        "first_name": {"max_length": 128},
+        "last_name": {"max_length": 128},
+        "company_name": {"max_length": 128},
         "email_address": {
             "pattern": r'^([^<>()\[\]\.,;:\s@"]+(\.[^<>()\[\]\.,;:\s@"]+)*)@(([a-zA-Z-_0-9]+\.)+[a-zA-Z]{2,})$'
         },
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/__init__.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/__init__.py
index 1cdfeb9a7b4..d920cd5fb72 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/__init__.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/__init__.py
@@ -5,35 +5,41 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._monitors_operations import MonitorsOperations
-from ._elastic_versions_operations import ElasticVersionsOperations
-from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations
-from ._monitored_resources_operations import MonitoredResourcesOperations
-from ._deployment_info_operations import DeploymentInfoOperations
-from ._external_user_operations import ExternalUserOperations
-from ._billing_info_operations import BillingInfoOperations
-from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations
-from ._open_ai_operations import OpenAIOperations
-from ._tag_rules_operations import TagRulesOperations
-from ._vm_host_operations import VMHostOperations
-from ._vm_ingestion_operations import VMIngestionOperations
-from ._vm_collection_operations import VMCollectionOperations
-from ._upgradable_versions_operations import UpgradableVersionsOperations
-from ._monitor_operations import MonitorOperations
-from ._all_traffic_filters_operations import AllTrafficFiltersOperations
-from ._list_associated_traffic_filters_operations import ListAssociatedTrafficFiltersOperations
-from ._create_and_associate_ip_filter_operations import CreateAndAssociateIPFilterOperations
-from ._create_and_associate_pl_filter_operations import CreateAndAssociatePLFilterOperations
-from ._associate_traffic_filter_operations import AssociateTrafficFilterOperations
-from ._detach_and_delete_traffic_filter_operations import DetachAndDeleteTrafficFilterOperations
-from ._detach_traffic_filter_operations import DetachTrafficFilterOperations
-from ._traffic_filters_operations import TrafficFiltersOperations
-from ._organizations_operations import OrganizationsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._monitors_operations import MonitorsOperations  # type: ignore
+from ._elastic_versions_operations import ElasticVersionsOperations  # type: ignore
+from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations  # type: ignore
+from ._monitored_resources_operations import MonitoredResourcesOperations  # type: ignore
+from ._deployment_info_operations import DeploymentInfoOperations  # type: ignore
+from ._external_user_operations import ExternalUserOperations  # type: ignore
+from ._billing_info_operations import BillingInfoOperations  # type: ignore
+from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations  # type: ignore
+from ._open_ai_operations import OpenAIOperations  # type: ignore
+from ._tag_rules_operations import TagRulesOperations  # type: ignore
+from ._vm_host_operations import VMHostOperations  # type: ignore
+from ._vm_ingestion_operations import VMIngestionOperations  # type: ignore
+from ._vm_collection_operations import VMCollectionOperations  # type: ignore
+from ._upgradable_versions_operations import UpgradableVersionsOperations  # type: ignore
+from ._monitor_operations import MonitorOperations  # type: ignore
+from ._all_traffic_filters_operations import AllTrafficFiltersOperations  # type: ignore
+from ._list_associated_traffic_filters_operations import ListAssociatedTrafficFiltersOperations  # type: ignore
+from ._create_and_associate_ip_filter_operations import CreateAndAssociateIPFilterOperations  # type: ignore
+from ._create_and_associate_pl_filter_operations import CreateAndAssociatePLFilterOperations  # type: ignore
+from ._associate_traffic_filter_operations import AssociateTrafficFilterOperations  # type: ignore
+from ._detach_and_delete_traffic_filter_operations import DetachAndDeleteTrafficFilterOperations  # type: ignore
+from ._detach_traffic_filter_operations import DetachTrafficFilterOperations  # type: ignore
+from ._traffic_filters_operations import TrafficFiltersOperations  # type: ignore
+from ._organizations_operations import OrganizationsOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -63,5 +69,5 @@
     "TrafficFiltersOperations",
     "OrganizationsOperations",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 _patch_sdk()
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_all_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_all_traffic_filters_operations.py
index 247e471b004..bf11956b7b1 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_all_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_all_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -41,7 +40,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -102,7 +101,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.elastic.models.ElasticTrafficFilterResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_associate_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_associate_traffic_filter_operations.py
index 5e55c23410e..b9391deb8ec 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_associate_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_associate_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar, Union, cast
+from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -52,7 +51,7 @@ def build_associate_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -103,7 +102,7 @@ def __init__(self, *args, **kwargs):
     def _associate_initial(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_billing_info_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_billing_info_operations.py
index c9edfaf26c5..fb6fdf7de65 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_billing_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_billing_info_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -41,7 +40,7 @@ def build_get_request(resource_group_name: str, monitor_name: str, subscription_
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -102,7 +101,7 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo
         :rtype: ~azure.mgmt.elastic.models.BillingInfoResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_connected_partner_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_connected_partner_resources_operations.py
index 09c93caa207..8327601db1e 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_connected_partner_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_connected_partner_resources_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -116,7 +115,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ConnectedPartnerResourcesListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_ip_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_ip_filter_operations.py
index fc1856b098c..6e18029c704 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_ip_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_ip_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar, Union, cast
+from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -53,7 +52,7 @@ def build_create_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -111,7 +110,7 @@ def _create_initial(
         name: Optional[str] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_pl_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_pl_filter_operations.py
index 62d8bb2a09d..52569e03b40 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_pl_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_create_and_associate_pl_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar, Union, cast
+from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -54,7 +53,7 @@ def build_create_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -115,7 +114,7 @@ def _create_initial(
         private_endpoint_name: Optional[str] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_deployment_info_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_deployment_info_operations.py
index 02d51ddb261..3ac2298a5d0 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_deployment_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_deployment_info_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -41,7 +40,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -104,7 +103,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.elastic.models.DeploymentInfoResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_and_delete_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_and_delete_traffic_filter_operations.py
index b9725a5a591..fa4e58b6e59 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_and_delete_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_and_delete_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -115,7 +114,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_traffic_filter_operations.py
index 8f24ed5e6b7..a25e8bc1548 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_detach_traffic_filter_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterator, Optional, Type, TypeVar, Union, cast
+from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, Union, cast
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -33,7 +32,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -52,7 +51,7 @@ def build_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -103,7 +102,7 @@ def __init__(self, *args, **kwargs):
     def _update_initial(
         self, resource_group_name: str, monitor_name: str, ruleset_id: Optional[str] = None, **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_elastic_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_elastic_versions_operations.py
index 24efb544643..04209472a1b 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_elastic_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_elastic_versions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_list_request(subscription_id: str, *, region: 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", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -102,7 +101,7 @@ def list(self, region: str, **kwargs: Any) -> Iterable["_models.ElasticVersionLi
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticVersionsListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_external_user_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_external_user_operations.py
index e742701dd18..045936129d1 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_external_user_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_external_user_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -30,7 +29,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -44,7 +43,7 @@ def build_create_or_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -181,7 +180,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.ExternalUserCreationResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_list_associated_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_list_associated_traffic_filters_operations.py
index 93cec5f7883..0d964ae362a 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_list_associated_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_list_associated_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -41,7 +40,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -102,7 +101,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.elastic.models.ElasticTrafficFilterResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitor_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitor_operations.py
index f075ef02824..d93304c4aae 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitor_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitor_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterator, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -34,7 +33,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_upgrade_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -104,7 +103,7 @@ def _upgrade_initial(
         body: Optional[Union[_models.ElasticMonitorUpgrade, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_resources_operations.py
index d63d85cc8f3..53c198e1510 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_resources_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -110,7 +109,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoredResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_subscriptions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_subscriptions_operations.py
index 69d5312700d..01f6135d414 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_subscriptions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitored_subscriptions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -36,7 +35,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -81,7 +80,7 @@ def build_get_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -115,7 +114,7 @@ def build_createor_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -152,7 +151,7 @@ def build_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -189,7 +188,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -261,7 +260,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoredSubscriptionPropertiesList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -343,7 +342,7 @@ def get(
         :rtype: ~azure.mgmt.elastic.models.MonitoredSubscriptionProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +394,7 @@ def _createor_update_initial(
         body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -612,7 +611,7 @@ def _update_initial(
         body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -828,7 +827,7 @@ def get_long_running_output(pipeline_response):
     def _delete_initial(
         self, resource_group_name: str, monitor_name: str, configuration_name: str, **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitors_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitors_operations.py
index 06572eb6d65..41b27a83bc5 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitors_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_monitors_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -36,7 +35,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest:
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -72,7 +71,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -102,7 +101,7 @@ def build_get_request(resource_group_name: str, monitor_name: str, subscription_
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -135,7 +134,7 @@ def build_create_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -171,7 +170,7 @@ def build_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -207,7 +206,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -270,7 +269,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.ElasticMonitorResource"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticMonitorResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -355,7 +354,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.ElasticMonitorResourceListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -434,7 +433,7 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo
         :rtype: ~azure.mgmt.elastic.models.ElasticMonitorResource
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -486,7 +485,7 @@ def _create_initial(
         body: Optional[Union[_models.ElasticMonitorResource, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -692,7 +691,7 @@ def _update_initial(
         body: Optional[Union[_models.ElasticMonitorResourceUpdateParameters, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -894,7 +893,7 @@ def get_long_running_output(pipeline_response):
         )
 
     def _delete_initial(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_open_ai_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_open_ai_operations.py
index d882b6b5b1f..233d532c027 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_open_ai_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_open_ai_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -32,7 +31,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -44,7 +43,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -77,7 +76,7 @@ def build_get_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -111,7 +110,7 @@ def build_create_or_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -148,7 +147,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -182,7 +181,7 @@ def build_get_status_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -253,7 +252,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.OpenAIIntegrationRPModelListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -337,7 +336,7 @@ def get(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationRPModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -474,7 +473,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationRPModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +553,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -615,7 +614,7 @@ def get_status(
         :rtype: ~azure.mgmt.elastic.models.OpenAIIntegrationStatusResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_operations.py
index 5811170a74f..9088a00e42f 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,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", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -93,7 +92,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]:
         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: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_organizations_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_organizations_operations.py
index 637c0aa8d3e..704d66abfc2 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_organizations_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_organizations_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterator, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -34,7 +33,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -46,7 +45,7 @@ def build_get_api_key_request(subscription_id: str, **kwargs: Any) -> HttpReques
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -77,7 +76,7 @@ def build_get_elastic_to_azure_subscription_mapping_request(  # pylint: disable=
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -106,7 +105,7 @@ def build_resubscribe_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -214,7 +213,7 @@ def get_api_key(
         :rtype: ~azure.mgmt.elastic.models.UserApiKeyResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -284,7 +283,7 @@ def get_elastic_to_azure_subscription_mapping(  # pylint: disable=name-too-long
         :rtype: ~azure.mgmt.elastic.models.ElasticOrganizationToAzureSubscriptionMappingResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -336,7 +335,7 @@ def _resubscribe_initial(
         body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None,
         **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_tag_rules_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_tag_rules_operations.py
index c90ee68c915..4d1467d997e 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_tag_rules_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_tag_rules_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -36,7 +35,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -81,7 +80,7 @@ def build_create_or_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -118,7 +117,7 @@ def build_get_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -152,7 +151,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -222,7 +221,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.MonitoringTagRulesListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +377,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.elastic.models.MonitoringTagRules
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -458,7 +457,7 @@ def get(
         :rtype: ~azure.mgmt.elastic.models.MonitoringTagRules
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +506,7 @@ def get(
     def _delete_initial(
         self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any
     ) -> Iterator[bytes]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_traffic_filters_operations.py
index da9e60c4ef6..e47a253e49a 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_traffic_filters_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -48,7 +47,7 @@ def build_delete_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -115,7 +114,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_upgradable_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_upgradable_versions_operations.py
index 97c59ff6a68..d262ea56b54 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_upgradable_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_upgradable_versions_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_details_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -104,7 +103,7 @@ def details(self, resource_group_name: str, monitor_name: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.elastic.models.UpgradableVersionsList
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_collection_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_collection_operations.py
index 0e01c0b74d5..a2b05fe39e8 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_collection_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_collection_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +7,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -30,7 +29,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -44,7 +43,7 @@ def build_update_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -94,7 +93,7 @@ def __init__(self, *args, **kwargs):
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @overload
-    def update(  # pylint: disable=inconsistent-return-statements
+    def update(
         self,
         resource_group_name: str,
         monitor_name: str,
@@ -123,7 +122,7 @@ def update(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def update(  # pylint: disable=inconsistent-return-statements
+    def update(
         self,
         resource_group_name: str,
         monitor_name: str,
@@ -175,7 +174,7 @@ def update(  # pylint: disable=inconsistent-return-statements
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_host_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_host_operations.py
index 44069753b84..fe7103e179e 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_host_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_host_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -31,7 +30,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -110,7 +109,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         cls: ClsType[_models.VMHostListResponse] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_ingestion_operations.py b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_ingestion_operations.py
index 355848b89f6..37ad1c9f1c4 100644
--- a/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_ingestion_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/azure/mgmt/elastic/operations/_vm_ingestion_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 import sys
-from typing import Any, Callable, Dict, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -29,7 +28,7 @@
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -43,7 +42,7 @@ def build_details_request(
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-06-15-preview"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2025-01-15-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -104,7 +103,7 @@ def details(self, resource_group_name: str, monitor_name: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.elastic.models.VMIngestionDetailsResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/all_traffic_filters_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/all_traffic_filters_list.py
index 192c220eacf..f9f96a18fd7 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/all_traffic_filters_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/all_traffic_filters_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/AllTrafficFilters_list.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/AllTrafficFilters_list.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/associate_traffic_filter_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/associate_traffic_filter_update.py
index 86d4e919a9c..6ddeffc24d0 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/associate_traffic_filter_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/associate_traffic_filter_update.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/AssociateTrafficFilter_Update.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/AssociateTrafficFilter_Update.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/associated_filters_for_deployment_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/associated_filters_for_deployment_list.py
index 94485706a70..332c30cf117 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/associated_filters_for_deployment_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/associated_filters_for_deployment_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/AssociatedFiltersForDeployment_list.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/AssociatedFiltersForDeployment_list.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/billing_info_get.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/billing_info_get.py
index d63d5aff340..0f04a67c7e1 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/billing_info_get.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/billing_info_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/BillingInfo_Get.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/BillingInfo_Get.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/connected_partner_resources_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/connected_partner_resources_list.py
index d1291a1790b..3af5e38caa4 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/connected_partner_resources_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/connected_partner_resources_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/ConnectedPartnerResources_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/ConnectedPartnerResources_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/deployment_info_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/deployment_info_list.py
index e72c44fd3a1..3e8501883db 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/deployment_info_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/deployment_info_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/DeploymentInfo_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/DeploymentInfo_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_and_delete_traffic_filter_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_and_delete_traffic_filter_delete.py
index 4bb6081719f..780dda10e8f 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_and_delete_traffic_filter_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_and_delete_traffic_filter_delete.py
@@ -36,6 +36,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/DetachAndDeleteTrafficFilter_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/DetachAndDeleteTrafficFilter_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_traffic_filters_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_traffic_filters_update.py
index f02a77efb66..d62369949c5 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_traffic_filters_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/detach_traffic_filters_update.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/DetachTrafficFilters_Update.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/DetachTrafficFilters_Update.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/elastic_versions_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/elastic_versions_list.py
index 99f685505a3..c3349e7a02f 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/elastic_versions_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/elastic_versions_list.py
@@ -37,6 +37,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/ElasticVersions_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/ElasticVersions_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/external_user_info.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/external_user_info.py
index 5898f821f03..3a1590107a0 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/external_user_info.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/external_user_info.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/ExternalUserInfo.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/ExternalUserInfo.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/ip_traffic_filter_create.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/ip_traffic_filter_create.py
index 0a6ad7a8464..326972e035f 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/ip_traffic_filter_create.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/ip_traffic_filter_create.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/IPTrafficFilter_Create.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/IPTrafficFilter_Create.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitor_upgrade.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitor_upgrade.py
index 4342e54799c..8682b637c21 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitor_upgrade.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitor_upgrade.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitor_Upgrade.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitor_Upgrade.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_resources_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_resources_list.py
index c7d6b86e09e..f25c31c891e 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_resources_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_resources_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredResources_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredResources_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_createor_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_createor_update.py
index 43b6c606ca2..ce0a36e9e82 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_createor_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_createor_update.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredSubscriptions_CreateorUpdate.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredSubscriptions_CreateorUpdate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_delete.py
index 748f2394492..b3844a66b42 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_delete.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredSubscriptions_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredSubscriptions_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_get.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_get.py
index 4023857d25c..5b9d5b3b34d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_get.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredSubscriptions_Get.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredSubscriptions_Get.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_list.py
index 76e5a8085a8..ecf097f5ddf 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredSubscriptions_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredSubscriptions_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_update.py
index 729b049942e..84a1cbe1a0e 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitored_subscriptions_update.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/MonitoredSubscriptions_Update.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/MonitoredSubscriptions_Update.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_create.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_create.py
index 8b1f4ebd3fc..902532f8daf 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_create.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_create.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_Create.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_Create.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_delete.py
index 4f8086aa0e8..0347b5056c4 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_delete.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_get.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_get.py
index 811546973bf..c49facb7f13 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_get.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_Get.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_Get.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list.py
index 2c625cfdb3a..757ffb8f73d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list_by_resource_group.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list_by_resource_group.py
index f9cc17b0731..038b3ae4f75 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list_by_resource_group.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_list_by_resource_group.py
@@ -37,6 +37,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_ListByResourceGroup.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_ListByResourceGroup.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_update.py
index b88a09930f1..a0bf974820e 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/monitors_update.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Monitors_Update.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Monitors_Update.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_create_or_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_create_or_update.py
index 83ac9a43b3c..a7c6c63372a 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_create_or_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_create_or_update.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/OpenAI_CreateOrUpdate.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/OpenAI_CreateOrUpdate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_delete.py
index 0475f4f3853..39a4b386f68 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/OpenAI_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/OpenAI_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get.py
index 669ca691ff4..31e090c5b2a 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/OpenAI_Get.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/OpenAI_Get.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get_status.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get_status.py
index 6dffd6a9c13..51dc908f8ca 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get_status.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_get_status.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/OpenAI_GetStatus.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/OpenAI_GetStatus.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_list.py
index 4a61dc18864..14504fd1fe0 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/open_ai_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/OpenAI_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/OpenAI_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/operations_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/operations_list.py
index f958f28edbd..fa8714582ab 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/operations_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/operations_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Operations_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Operations_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_api_key.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_api_key.py
index 379c1d421a2..1f23c350a26 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_api_key.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_api_key.py
@@ -34,6 +34,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Organizations_GetApiKey.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Organizations_GetApiKey.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_elastic_to_azure_subscription_mapping.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_elastic_to_azure_subscription_mapping.py
index ab851377bbe..e9206223ea1 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_elastic_to_azure_subscription_mapping.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_get_elastic_to_azure_subscription_mapping.py
@@ -34,6 +34,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Organizations_GetElasticToAzureSubscriptionMapping.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Organizations_GetElasticToAzureSubscriptionMapping.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_resubscribe.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_resubscribe.py
index d41596481c5..d992c89187d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_resubscribe.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/organizations_resubscribe.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/Organizations_Resubscribe.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/Organizations_Resubscribe.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/private_link_traffic_filters_create.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/private_link_traffic_filters_create.py
index 97ed397049d..2beb3c2fe0d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/private_link_traffic_filters_create.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/private_link_traffic_filters_create.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/PrivateLinkTrafficFilters_Create.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/PrivateLinkTrafficFilters_Create.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_create_or_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_create_or_update.py
index c5ec10d30dc..0e0385f9412 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_create_or_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_create_or_update.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/TagRules_CreateOrUpdate.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/TagRules_CreateOrUpdate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_delete.py
index 51275907533..69fdb2f49ce 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_delete.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/TagRules_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/TagRules_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_get.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_get.py
index 5827ddbab4f..aa408272bbc 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_get.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/TagRules_Get.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/TagRules_Get.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_list.py
index ee84a6dbbcb..375046dd9ed 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/tag_rules_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/TagRules_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/TagRules_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/traffic_filters_delete.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/traffic_filters_delete.py
index e90d069400f..b9f7f28dceb 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/traffic_filters_delete.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/traffic_filters_delete.py
@@ -36,6 +36,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/TrafficFilters_Delete.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/TrafficFilters_Delete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/upgradable_versions_details.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/upgradable_versions_details.py
index c61e8a3f0b5..8db728b696e 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/upgradable_versions_details.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/upgradable_versions_details.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/UpgradableVersions_Details.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/UpgradableVersions_Details.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_collection_update.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_collection_update.py
index e74269665eb..e8062fbe8ed 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_collection_update.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_collection_update.py
@@ -36,6 +36,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/VMCollection_Update.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/VMCollection_Update.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_host_list.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_host_list.py
index 087403205d0..2dec81747e2 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_host_list.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_host_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/VMHost_List.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/VMHost_List.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_ingestion_details.py b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_ingestion_details.py
index a7392fa83c4..8b3ed831cca 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_ingestion_details.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_samples/vm_ingestion_details.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2024-06-15-preview/examples/VMIngestion_Details.json
+# x-ms-original-file: specification/elastic/resource-manager/Microsoft.Elastic/preview/2025-01-15-preview/examples/VMIngestion_Details.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/conftest.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/conftest.py
index d03a078ad93..399f5d48998 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/conftest.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/conftest.py
@@ -18,7 +18,7 @@
 load_dotenv()
 
 
-# aovid record sensitive identity information in recordings
+# For security, please avoid record sensitive identity information in recordings
 @pytest.fixture(scope="session", autouse=True)
 def add_sanitizers(test_proxy):
     microsoftelastic_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000")
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations.py
index e4db0452e98..bd1abc2dbd2 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_all_traffic_filters_list(self, resource_group):
         response = self.client.all_traffic_filters.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations_async.py
index a3357ea7d5b..9413815ffd3 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_all_traffic_filters_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_all_traffic_filters_list(self, resource_group):
         response = await self.client.all_traffic_filters.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations.py
index cb81bf7f2e8..ddd633afd2c 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_associate(self, resource_group):
+    def test_associate_traffic_filter_begin_associate(self, resource_group):
         response = self.client.associate_traffic_filter.begin_associate(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations_async.py
index 6873c474445..3dd9e4b4d1d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_associate_traffic_filter_operations_async.py
@@ -21,12 +21,12 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_associate(self, resource_group):
+    async def test_associate_traffic_filter_begin_associate(self, resource_group):
         response = await (
             await self.client.associate_traffic_filter.begin_associate(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations.py
index 7de79a9848b..aed92953900 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get(self, resource_group):
+    def test_billing_info_get(self, resource_group):
         response = self.client.billing_info.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations_async.py
index 31247e4b676..a17e3dfdc65 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_billing_info_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get(self, resource_group):
+    async def test_billing_info_get(self, resource_group):
         response = await self.client.billing_info.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations.py
index fa57f45907a..f09f8924b06 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_connected_partner_resources_list(self, resource_group):
         response = self.client.connected_partner_resources.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations_async.py
index b7563fb50da..506ef7875eb 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_connected_partner_resources_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_connected_partner_resources_list(self, resource_group):
         response = self.client.connected_partner_resources.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations.py
index c8e0940e5ad..512cd093bd7 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_create(self, resource_group):
+    def test_create_and_associate_ip_filter_begin_create(self, resource_group):
         response = self.client.create_and_associate_ip_filter.begin_create(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations_async.py
index 6f46465ad58..aafc6d29e87 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_ip_filter_operations_async.py
@@ -21,12 +21,12 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_create(self, resource_group):
+    async def test_create_and_associate_ip_filter_begin_create(self, resource_group):
         response = await (
             await self.client.create_and_associate_ip_filter.begin_create(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations.py
index 1c8d37c16df..52c8fdd5712 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_create(self, resource_group):
+    def test_create_and_associate_pl_filter_begin_create(self, resource_group):
         response = self.client.create_and_associate_pl_filter.begin_create(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations_async.py
index 106640ce814..0aaa0e8f59b 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_create_and_associate_pl_filter_operations_async.py
@@ -21,12 +21,12 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_create(self, resource_group):
+    async def test_create_and_associate_pl_filter_begin_create(self, resource_group):
         response = await (
             await self.client.create_and_associate_pl_filter.begin_create(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations.py
index 1c800b47247..2b75570f009 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_deployment_info_list(self, resource_group):
         response = self.client.deployment_info.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations_async.py
index 8aa7f9dbb4f..b1af8fa62b7 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_deployment_info_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_deployment_info_list(self, resource_group):
         response = await self.client.deployment_info.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations.py
index f65ec1a02ac..dcdb9b7929c 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_delete(self, resource_group):
+    def test_detach_and_delete_traffic_filter_delete(self, resource_group):
         response = self.client.detach_and_delete_traffic_filter.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations_async.py
index e908cf0c3f1..a8f5a9aaa20 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_and_delete_traffic_filter_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_delete(self, resource_group):
+    async def test_detach_and_delete_traffic_filter_delete(self, resource_group):
         response = await self.client.detach_and_delete_traffic_filter.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations.py
index 46428fc636a..7d4833d3db9 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_update(self, resource_group):
+    def test_detach_traffic_filter_begin_update(self, resource_group):
         response = self.client.detach_traffic_filter.begin_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations_async.py
index dce5638c7df..b53536176a2 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_detach_traffic_filter_operations_async.py
@@ -21,12 +21,12 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_update(self, resource_group):
+    async def test_detach_traffic_filter_begin_update(self, resource_group):
         response = await (
             await self.client.detach_traffic_filter.begin_update(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations.py
index bc3f8467455..c1b99fc42d3 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations.py
@@ -20,10 +20,10 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_elastic_versions_list(self, resource_group):
         response = self.client.elastic_versions.list(
             region="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations_async.py
index 4b092239c41..cdd8114c917 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_elastic_versions_operations_async.py
@@ -21,10 +21,10 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_elastic_versions_list(self, resource_group):
         response = self.client.elastic_versions.list(
             region="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations.py
index f223f743532..430b4f7215b 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_create_or_update(self, resource_group):
+    def test_external_user_create_or_update(self, resource_group):
         response = self.client.external_user.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations_async.py
index 1b2255806e5..899878e7cb0 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_external_user_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_create_or_update(self, resource_group):
+    async def test_external_user_create_or_update(self, resource_group):
         response = await self.client.external_user.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations.py
index d2112aeca6d..ea921229a68 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_list_associated_traffic_filters_list(self, resource_group):
         response = self.client.list_associated_traffic_filters.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations_async.py
index 8a1607e917a..51eb3c9d2b8 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_list_associated_traffic_filters_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_list_associated_traffic_filters_list(self, resource_group):
         response = await self.client.list_associated_traffic_filters.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations.py
index f2d187a15c3..534001cf522 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_upgrade(self, resource_group):
+    def test_monitor_begin_upgrade(self, resource_group):
         response = self.client.monitor.begin_upgrade(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations_async.py
index 6fecd472234..6ad863bc4de 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitor_operations_async.py
@@ -21,12 +21,12 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_upgrade(self, resource_group):
+    async def test_monitor_begin_upgrade(self, resource_group):
         response = await (
             await self.client.monitor.begin_upgrade(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations.py
index d48fda06cbf..76bc6fdb8f7 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_monitored_resources_list(self, resource_group):
         response = self.client.monitored_resources.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations_async.py
index 5fd3ed4e05d..46791358019 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_resources_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_monitored_resources_list(self, resource_group):
         response = self.client.monitored_resources.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations.py
index 7ac36dd351d..689a44093a4 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_monitored_subscriptions_list(self, resource_group):
         response = self.client.monitored_subscriptions.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
@@ -32,12 +32,12 @@ def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get(self, resource_group):
+    def test_monitored_subscriptions_get(self, resource_group):
         response = self.client.monitored_subscriptions.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             configuration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -45,12 +45,12 @@ def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_createor_update(self, resource_group):
+    def test_monitored_subscriptions_begin_createor_update(self, resource_group):
         response = self.client.monitored_subscriptions.begin_createor_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             configuration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
@@ -58,12 +58,12 @@ def test_begin_createor_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_update(self, resource_group):
+    def test_monitored_subscriptions_begin_update(self, resource_group):
         response = self.client.monitored_subscriptions.begin_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             configuration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
@@ -71,12 +71,12 @@ def test_begin_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_delete(self, resource_group):
+    def test_monitored_subscriptions_begin_delete(self, resource_group):
         response = self.client.monitored_subscriptions.begin_delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
             configuration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations_async.py
index 0dc276dccaf..8ac20fc803d 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitored_subscriptions_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_monitored_subscriptions_list(self, resource_group):
         response = self.client.monitored_subscriptions.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
@@ -33,12 +33,12 @@ async def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get(self, resource_group):
+    async def test_monitored_subscriptions_get(self, resource_group):
         response = await self.client.monitored_subscriptions.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             configuration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -46,13 +46,13 @@ async def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_createor_update(self, resource_group):
+    async def test_monitored_subscriptions_begin_createor_update(self, resource_group):
         response = await (
             await self.client.monitored_subscriptions.begin_createor_update(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
                 configuration_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
@@ -61,13 +61,13 @@ async def test_begin_createor_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_update(self, resource_group):
+    async def test_monitored_subscriptions_begin_update(self, resource_group):
         response = await (
             await self.client.monitored_subscriptions.begin_update(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
                 configuration_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
@@ -76,13 +76,13 @@ async def test_begin_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_delete(self, resource_group):
+    async def test_monitored_subscriptions_begin_delete(self, resource_group):
         response = await (
             await self.client.monitored_subscriptions.begin_delete(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
                 configuration_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations.py
index 99b10372f79..f4cf9c31766 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations.py
@@ -20,9 +20,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_monitors_list(self, resource_group):
         response = self.client.monitors.list(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
@@ -30,10 +30,10 @@ def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list_by_resource_group(self, resource_group):
+    def test_monitors_list_by_resource_group(self, resource_group):
         response = self.client.monitors.list_by_resource_group(
             resource_group_name=resource_group.name,
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
@@ -41,11 +41,11 @@ def test_list_by_resource_group(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get(self, resource_group):
+    def test_monitors_get(self, resource_group):
         response = self.client.monitors.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -53,11 +53,11 @@ def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_create(self, resource_group):
+    def test_monitors_begin_create(self, resource_group):
         response = self.client.monitors.begin_create(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
@@ -65,11 +65,11 @@ def test_begin_create(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_update(self, resource_group):
+    def test_monitors_begin_update(self, resource_group):
         response = self.client.monitors.begin_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
@@ -77,11 +77,11 @@ def test_begin_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_delete(self, resource_group):
+    def test_monitors_begin_delete(self, resource_group):
         response = self.client.monitors.begin_delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations_async.py
index c839ca62f46..4695c8a946b 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_monitors_operations_async.py
@@ -21,9 +21,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_monitors_list(self, resource_group):
         response = self.client.monitors.list(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
@@ -31,10 +31,10 @@ async def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list_by_resource_group(self, resource_group):
+    async def test_monitors_list_by_resource_group(self, resource_group):
         response = self.client.monitors.list_by_resource_group(
             resource_group_name=resource_group.name,
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
@@ -42,11 +42,11 @@ async def test_list_by_resource_group(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get(self, resource_group):
+    async def test_monitors_get(self, resource_group):
         response = await self.client.monitors.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -54,12 +54,12 @@ async def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_create(self, resource_group):
+    async def test_monitors_begin_create(self, resource_group):
         response = await (
             await self.client.monitors.begin_create(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
@@ -68,12 +68,12 @@ async def test_begin_create(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_update(self, resource_group):
+    async def test_monitors_begin_update(self, resource_group):
         response = await (
             await self.client.monitors.begin_update(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
@@ -82,12 +82,12 @@ async def test_begin_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_delete(self, resource_group):
+    async def test_monitors_begin_delete(self, resource_group):
         response = await (
             await self.client.monitors.begin_delete(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations.py
index 03b3fa6a3b2..851bf435232 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_open_ai_list(self, resource_group):
         response = self.client.open_ai.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
@@ -32,12 +32,12 @@ def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get(self, resource_group):
+    def test_open_ai_get(self, resource_group):
         response = self.client.open_ai.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -45,12 +45,12 @@ def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_create_or_update(self, resource_group):
+    def test_open_ai_create_or_update(self, resource_group):
         response = self.client.open_ai.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -58,12 +58,12 @@ def test_create_or_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_delete(self, resource_group):
+    def test_open_ai_delete(self, resource_group):
         response = self.client.open_ai.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -71,12 +71,12 @@ def test_delete(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get_status(self, resource_group):
+    def test_open_ai_get_status(self, resource_group):
         response = self.client.open_ai.get_status(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations_async.py
index 812b715a0c6..7edc87d1040 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_open_ai_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_open_ai_list(self, resource_group):
         response = self.client.open_ai.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
@@ -33,12 +33,12 @@ async def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get(self, resource_group):
+    async def test_open_ai_get(self, resource_group):
         response = await self.client.open_ai.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -46,12 +46,12 @@ async def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_create_or_update(self, resource_group):
+    async def test_open_ai_create_or_update(self, resource_group):
         response = await self.client.open_ai.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -59,12 +59,12 @@ async def test_create_or_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_delete(self, resource_group):
+    async def test_open_ai_delete(self, resource_group):
         response = await self.client.open_ai.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -72,12 +72,12 @@ async def test_delete(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get_status(self, resource_group):
+    async def test_open_ai_get_status(self, resource_group):
         response = await self.client.open_ai.get_status(
             resource_group_name=resource_group.name,
             monitor_name="str",
             integration_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations.py
index d476086e4f3..1428fffc5b2 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations.py
@@ -20,9 +20,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_operations_list(self, resource_group):
         response = self.client.operations.list(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations_async.py
index d61bd1cd717..62ec5d69095 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_operations_async.py
@@ -21,9 +21,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_operations_list(self, resource_group):
         response = self.client.operations.list(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations.py
index af42b24aeda..ae79ee4bea9 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations.py
@@ -20,9 +20,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get_api_key(self, resource_group):
+    def test_organizations_get_api_key(self, resource_group):
         response = self.client.organizations.get_api_key(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -30,9 +30,9 @@ def test_get_api_key(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get_elastic_to_azure_subscription_mapping(self, resource_group):
+    def test_organizations_get_elastic_to_azure_subscription_mapping(self, resource_group):
         response = self.client.organizations.get_elastic_to_azure_subscription_mapping(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -40,11 +40,11 @@ def test_get_elastic_to_azure_subscription_mapping(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_resubscribe(self, resource_group):
+    def test_organizations_begin_resubscribe(self, resource_group):
         response = self.client.organizations.begin_resubscribe(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations_async.py
index b73734e0416..b07367c5f63 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_organizations_operations_async.py
@@ -21,9 +21,9 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get_api_key(self, resource_group):
+    async def test_organizations_get_api_key(self, resource_group):
         response = await self.client.organizations.get_api_key(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -31,9 +31,9 @@ async def test_get_api_key(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get_elastic_to_azure_subscription_mapping(self, resource_group):
+    async def test_organizations_get_elastic_to_azure_subscription_mapping(self, resource_group):
         response = await self.client.organizations.get_elastic_to_azure_subscription_mapping(
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -41,12 +41,12 @@ async def test_get_elastic_to_azure_subscription_mapping(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_resubscribe(self, resource_group):
+    async def test_organizations_begin_resubscribe(self, resource_group):
         response = await (
             await self.client.organizations.begin_resubscribe(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations.py
index a75af90ce3c..e429f605cf0 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_tag_rules_list(self, resource_group):
         response = self.client.tag_rules.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
@@ -32,12 +32,12 @@ def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_create_or_update(self, resource_group):
+    def test_tag_rules_create_or_update(self, resource_group):
         response = self.client.tag_rules.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             rule_set_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -45,12 +45,12 @@ def test_create_or_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_get(self, resource_group):
+    def test_tag_rules_get(self, resource_group):
         response = self.client.tag_rules.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             rule_set_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -58,12 +58,12 @@ def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_begin_delete(self, resource_group):
+    def test_tag_rules_begin_delete(self, resource_group):
         response = self.client.tag_rules.begin_delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
             rule_set_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         ).result()  # call '.result()' to poll until service return final result
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations_async.py
index fd9075f04ec..2505524fb7b 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_tag_rules_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_tag_rules_list(self, resource_group):
         response = self.client.tag_rules.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
@@ -33,12 +33,12 @@ async def test_list(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_create_or_update(self, resource_group):
+    async def test_tag_rules_create_or_update(self, resource_group):
         response = await self.client.tag_rules.create_or_update(
             resource_group_name=resource_group.name,
             monitor_name="str",
             rule_set_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -46,12 +46,12 @@ async def test_create_or_update(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_get(self, resource_group):
+    async def test_tag_rules_get(self, resource_group):
         response = await self.client.tag_rules.get(
             resource_group_name=resource_group.name,
             monitor_name="str",
             rule_set_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
@@ -59,13 +59,13 @@ async def test_get(self, resource_group):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_begin_delete(self, resource_group):
+    async def test_tag_rules_begin_delete(self, resource_group):
         response = await (
             await self.client.tag_rules.begin_delete(
                 resource_group_name=resource_group.name,
                 monitor_name="str",
                 rule_set_name="str",
-                api_version="2024-06-15-preview",
+                api_version="2025-01-15-preview",
             )
         ).result()  # call '.result()' to poll until service return final result
 
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations.py
index 14ce49475bd..b8748c68b49 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_delete(self, resource_group):
+    def test_traffic_filters_delete(self, resource_group):
         response = self.client.traffic_filters.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations_async.py
index 59606a937e1..12be0bbc500 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_traffic_filters_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_delete(self, resource_group):
+    async def test_traffic_filters_delete(self, resource_group):
         response = await self.client.traffic_filters.delete(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations.py
index 953d030f899..88774b50eb1 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_details(self, resource_group):
+    def test_upgradable_versions_details(self, resource_group):
         response = self.client.upgradable_versions.details(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations_async.py
index abea2df1aed..91e7203cee7 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_upgradable_versions_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_details(self, resource_group):
+    async def test_upgradable_versions_details(self, resource_group):
         response = await self.client.upgradable_versions.details(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations.py
index 483e36e3a77..4cba5edde4c 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_update(self, resource_group):
+    def test_vm_collection_update(self, resource_group):
         response = self.client.vm_collection.update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations_async.py
index 17f890e905b..bfbe9704b51 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_collection_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_update(self, resource_group):
+    async def test_vm_collection_update(self, resource_group):
         response = await self.client.vm_collection.update(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations.py
index 2be8d092eff..6dad264d510 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_list(self, resource_group):
+    def test_vm_host_list(self, resource_group):
         response = self.client.vm_host.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations_async.py
index 2cc96924144..94ae910a617 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_host_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_list(self, resource_group):
+    async def test_vm_host_list(self, resource_group):
         response = self.client.vm_host.list(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
         result = [r async for r in response]
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations.py
index 220607428fc..ebacb6e644c 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations.py
@@ -20,11 +20,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy
-    def test_details(self, resource_group):
+    def test_vm_ingestion_details(self, resource_group):
         response = self.client.vm_ingestion.details(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself
diff --git a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations_async.py b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations_async.py
index d7a0911cef8..e4d54cbc436 100644
--- a/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations_async.py
+++ b/sdk/elastic/azure-mgmt-elastic/generated_tests/test_microsoft_elastic_vm_ingestion_operations_async.py
@@ -21,11 +21,11 @@ def setup_method(self, method):
 
     @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
     @recorded_by_proxy_async
-    async def test_details(self, resource_group):
+    async def test_vm_ingestion_details(self, resource_group):
         response = await self.client.vm_ingestion.details(
             resource_group_name=resource_group.name,
             monitor_name="str",
-            api_version="2024-06-15-preview",
+            api_version="2025-01-15-preview",
         )
 
         # please add some check logic here by yourself